|
@@ -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)
|
|
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 @@ out_disable_device:
|
|
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;
|
|
}
|
|
}
|