diff options
| author |   Sumit.Saxena@lsi.com <Sumit.Saxena@lsi.com> | 2013-05-22 12:30:54 +0530 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2013-06-24 17:24:22 -0700 |
| commit | 105900d56e6f8a4dd47bb88fa387ab22ea787884 (patch) | |
| tree | 3b551895fac2f2bf6fdcb78e428faa68c3e94b99 /drivers/scsi/megaraid | |
| parent | [SCSI] megaraid_sas: Update balance count in driver to be in sync of firmware (diff) | |
| download | linux-dev-105900d56e6f8a4dd47bb88fa387ab22ea787884.tar.xz linux-dev-105900d56e6f8a4dd47bb88fa387ab22ea787884.zip | |
[SCSI] megaraid_sas: Free event detail memory without device ID check
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>
Diffstat (limited to 'drivers/scsi/megaraid')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 3d1aee7ac604..eadc8c873f45 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); |