Free event detail memory from more common place, instead of doing it for 
limited device types.

Signed-off-by: Sumit Saxena <sumit.sax...@lsi.com>
Signed-off-by: Adam Radford <aradf...@gmail.com>
---
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c 
b/drivers/scsi/megaraid/megaraid_sas_base.c
index c79daf5..5beea2f 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -4599,10 +4599,6 @@ static void megasas_detach_one(struct pci_dev *pdev)
                break;
        default:
                megasas_release_mfi(instance);
-               pci_free_consistent(pdev,
-                                   sizeof(struct megasas_evt_detail),
-                                   instance->evt_detail,
-                                   instance->evt_detail_h);
                pci_free_consistent(pdev, sizeof(u32),
                                    instance->producer,
                                    instance->producer_h);
@@ -4612,6 +4608,9 @@ static void megasas_detach_one(struct pci_dev *pdev)
                break;
        }
 
+       if (instance->evt_detail)
+               pci_free_consistent(pdev, sizeof(struct megasas_evt_detail),
+                               instance->evt_detail, instance->evt_detail_h);
        scsi_host_put(host);
 
        pci_set_drvdata(pdev, NULL);

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to