]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[SCSI] megaraid_sas: Free event detail memory without device ID check
authorSumit.Saxena@lsi.com <Sumit.Saxena@lsi.com>
Wed, 22 May 2013 07:00:54 +0000 (12:30 +0530)
committerJames Bottomley <JBottomley@Parallels.com>
Tue, 25 Jun 2013 00:24:22 +0000 (17:24 -0700)
Free event detail memory from more common place, instead of doing it for
limited device types.

Signed-off-by: Sumit Saxena <sumit.saxena@lsi.com>
Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/megaraid/megaraid_sas_base.c

index 3d1aee7ac604ae22f96583a118f6398983daf848..eadc8c873f45f3cb8edbf1455b52ae8b0456edda 100644 (file)
@@ -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);