2 files changed, 5 insertions, 11 deletions

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index c9e743ba09ec..1a3d195a2d36 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -3937,9 +3937,8 @@ megaraid_sysfs_free_resources(adapter_t *adapter)
 {
         mraid_device_t  *raid_dev = ADAP2RAIDDEV(adapter);
 
-        if (raid_dev->sysfs_uioc) kfree(raid_dev->sysfs_uioc);
-
-        if (raid_dev->sysfs_mbox64) kfree(raid_dev->sysfs_mbox64);
+        kfree(raid_dev->sysfs_uioc);
+        kfree(raid_dev->sysfs_mbox64);
 
         if (raid_dev->sysfs_buffer) {
                 pci_free_consistent(adapter->pdev, PAGE_SIZE,
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 37d110e864c4..8f3ce0432295 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -995,17 +995,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 +1153,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);