Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 105900d5 authored by Sumit.Saxena@lsi.com's avatar Sumit.Saxena@lsi.com Committed by James Bottomley
Browse files

[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: default avatarSumit Saxena <sumit.saxena@lsi.com>
Signed-off-by: default avatarAdam Radford <aradford@gmail.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 70b47b88

drivers/scsi/megaraid/megaraid_sas_base.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -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);