[PATCH] IPMI: misc fixes

[net-next-2.6.git] / drivers / char / ipmi / ipmi_msghandler.c

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index bfcc6a030a16fab92fb2cc989ed52f52139b15e1..4e4691a538901b7b728950edefcb33c5475abc56 100644 (file)
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -2142,8 +2142,7 @@ cleanup_bmc_device(struct kref *ref)
        bmc = container_of(ref, struct bmc_device, refcount);
 
        remove_files(bmc);
-       if (bmc->dev)
-               platform_device_unregister(bmc->dev);
+       platform_device_unregister(bmc->dev);
        kfree(bmc);
 }
 
@@ -2341,8 +2340,7 @@ static int ipmi_bmc_register(ipmi_smi_t intf, int ifnum,
 
                while (ipmi_find_bmc_prod_dev_id(&ipmidriver,
                                                 bmc->id.product_id,
-                                                bmc->id.device_id))
-               {
+                                                bmc->id.device_id)) {
                        if (!warn_printed) {
                                printk(KERN_WARNING PFX
                                       "This machine has two different BMCs"