xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] megaraid_sas: Free event detail memory without device ID check

Browse Source 
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>
This commit is contained in:
Sumit.Saxena@lsi.com
2013-05-22 12:30:54 +05:30
committed by James Bottomley
parent 70b47b881e
commit 105900d56e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/megaraid/megaraid_sas_base.c
View File

@@ -4599,10 +4599,6 @@ static void megasas_detach_one(struct pci_dev *pdev)
break; break;
default: default:
megasas_release_mfi(instance); 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), pci_free_consistent(pdev, sizeof(u32),
instance->producer, instance->producer,
instance->producer_h); instance->producer_h);
@@ -4612,6 +4608,9 @@ static void megasas_detach_one(struct pci_dev *pdev)
break; 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); scsi_host_put(host);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);