Commit 02f425f8 authored by Cathy Avery's avatar Cathy Avery Committed by Martin K. Petersen

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

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>
parent 5db6dd14
...@@ -1202,8 +1202,6 @@ static void pvscsi_shutdown_intr(struct pvscsi_adapter *adapter) ...@@ -1202,8 +1202,6 @@ static void pvscsi_shutdown_intr(struct pvscsi_adapter *adapter)
static void pvscsi_release_resources(struct pvscsi_adapter *adapter) static void pvscsi_release_resources(struct pvscsi_adapter *adapter)
{ {
pvscsi_shutdown_intr(adapter);
if (adapter->workqueue) if (adapter->workqueue)
destroy_workqueue(adapter->workqueue); destroy_workqueue(adapter->workqueue);
...@@ -1534,6 +1532,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1534,6 +1532,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
out_reset_adapter: out_reset_adapter:
ll_adapter_reset(adapter); ll_adapter_reset(adapter);
out_release_resources: out_release_resources:
pvscsi_shutdown_intr(adapter);
pvscsi_release_resources(adapter); pvscsi_release_resources(adapter);
scsi_host_put(host); scsi_host_put(host);
out_disable_device: out_disable_device:
...@@ -1542,6 +1541,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1542,6 +1541,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return error; return error;
out_release_resources_and_disable: out_release_resources_and_disable:
pvscsi_shutdown_intr(adapter);
pvscsi_release_resources(adapter); pvscsi_release_resources(adapter);
goto out_disable_device; goto out_disable_device;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment