Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / drivers / scsi / megaraid / megaraid_mm.c

diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 37d110e864c49c9c524e8347118e42050cdd3e49..e8f534fb336bac17c4fd20e2a6fc6fc374046d03 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -898,10 +898,8 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp)
 
        adapter = kmalloc(sizeof(mraid_mmadp_t), GFP_KERNEL);
 
-       if (!adapter) {
-               rval = -ENOMEM;
-               goto memalloc_error;
-       }
+       if (!adapter)
+               return -ENOMEM;
 
        memset(adapter, 0, sizeof(mraid_mmadp_t));
 
@@ -995,17 +993,13 @@ pthru_dma_pool_error:
 
 memalloc_error:
 
-       if (adapter->kioc_list)
-               kfree(adapter->kioc_list);
-
-       if (adapter->mbox_list)
-               kfree(adapter->mbox_list);
+       kfree(adapter->kioc_list);
+       kfree(adapter->mbox_list);
 
        if (adapter->pthru_dma_pool)
                pci_pool_destroy(adapter->pthru_dma_pool);
 
-       if (adapter)
-               kfree(adapter);
+       kfree(adapter);
 
        return rval;
 }
@@ -1157,7 +1151,6 @@ mraid_mm_free_adp_resources(mraid_mmadp_t *adp)
        }
 
        kfree(adp->kioc_list);
-
        kfree(adp->mbox_list);
 
        pci_pool_destroy(adp->pthru_dma_pool);