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

Commit a58fb834 authored by Cathy Avery's avatar Cathy Avery Committed by Greg Kroah-Hartman
Browse files

scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload 



[ Upstream commit 02f425f811cefcc4d325d7a72272651e622dc97e ]

Currently pvscsi_remove calls free_irq more than once as
pvscsi_release_resources and __pvscsi_shutdown both call
pvscsi_shutdown_intr. This results in a 'Trying to free already-free IRQ'
warning and stack trace. To solve the problem pvscsi_shutdown_intr has been
moved out of pvscsi_release_resources.

Signed-off-by: default avatarCathy Avery <cavery@redhat.com>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 13b968d5

drivers/scsi/vmw_pvscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -1202,8 +1202,6 @@ static void pvscsi_shutdown_intr(struct pvscsi_adapter *adapter) 


static void pvscsi_release_resources(struct pvscsi_adapter *adapter)

{

	pvscsi_shutdown_intr(adapter);



	if (adapter->workqueue)

		destroy_workqueue(adapter->workqueue);
@@ -1535,6 +1533,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
out_reset_adapter:

	ll_adapter_reset(adapter);

out_release_resources:

	pvscsi_shutdown_intr(adapter);

	pvscsi_release_resources(adapter);

	scsi_host_put(host);

out_disable_device:
@@ -1543,6 +1542,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	return error;



out_release_resources_and_disable:

	pvscsi_shutdown_intr(adapter);

	pvscsi_release_resources(adapter);

	goto out_disable_device;

}