diff options
| -rw-r--r-- | drivers/scsi/vmw_pvscsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index 6e491023fdd8..0d6b2a88fc8e 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c | |||
| @@ -1202,8 +1202,6 @@ static void pvscsi_shutdown_intr(struct pvscsi_adapter *adapter) | |||
| 1202 | 1202 | ||
| 1203 | static void pvscsi_release_resources(struct pvscsi_adapter *adapter) | 1203 | static void pvscsi_release_resources(struct pvscsi_adapter *adapter) |
| 1204 | { | 1204 | { |
| 1205 | pvscsi_shutdown_intr(adapter); | ||
| 1206 | |||
| 1207 | if (adapter->workqueue) | 1205 | if (adapter->workqueue) |
| 1208 | destroy_workqueue(adapter->workqueue); | 1206 | destroy_workqueue(adapter->workqueue); |
| 1209 | 1207 | ||
| @@ -1534,6 +1532,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1534 | out_reset_adapter: | 1532 | out_reset_adapter: |
| 1535 | ll_adapter_reset(adapter); | 1533 | ll_adapter_reset(adapter); |
| 1536 | out_release_resources: | 1534 | out_release_resources: |
| 1535 | pvscsi_shutdown_intr(adapter); | ||
| 1537 | pvscsi_release_resources(adapter); | 1536 | pvscsi_release_resources(adapter); |
| 1538 | scsi_host_put(host); | 1537 | scsi_host_put(host); |
| 1539 | out_disable_device: | 1538 | out_disable_device: |
| @@ -1542,6 +1541,7 @@ out_disable_device: | |||
| 1542 | return error; | 1541 | return error; |
| 1543 | 1542 | ||
| 1544 | out_release_resources_and_disable: | 1543 | out_release_resources_and_disable: |
| 1544 | pvscsi_shutdown_intr(adapter); | ||
| 1545 | pvscsi_release_resources(adapter); | 1545 | pvscsi_release_resources(adapter); |
| 1546 | goto out_disable_device; | 1546 | goto out_disable_device; |
| 1547 | } | 1547 | } |
