diff options
| author | Kashyap, Desai <kashyap.desai@lsi.com> | 2011-06-14 10:57:08 +0530 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-06-29 16:16:21 -0500 |
| commit | 7821578caa8cb831868989041112ab808029ca65 (patch) | |
| tree | be3fe92ec16d5c4142b0144718930ce6dab990cd /drivers/scsi/mpt2sas | |
| parent | f93213de5c28d4aeda51b3c03daf7e27f6dd2b7a (diff) | |
| download | linux-stable-7821578caa8cb831868989041112ab808029ca65.tar.gz linux-stable-7821578caa8cb831868989041112ab808029ca65.tar.bz2 linux-stable-7821578caa8cb831868989041112ab808029ca65.zip | |
[SCSI] mpt2sas: Added DID_NO_CONNECT return when driver remove and avoid shutdown call
Driver should not call shutdown call from _scsih_remove otherwise,
The scsi midlayer can be deadlocked when devices are removed from the driver
pci_driver->shutdown handler.
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/mpt2sas')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index c20f590c77b3..939f283d0c28 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c @@ -3763,7 +3763,7 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *)) return 0; } - if (ioc->pci_error_recovery) { + if (ioc->pci_error_recovery || ioc->remove_host) { scmd->result = DID_NO_CONNECT << 16; scmd->scsi_done(scmd); return 0; @@ -7350,7 +7350,6 @@ _scsih_remove(struct pci_dev *pdev) } sas_remove_host(shost); - _scsih_shutdown(pdev); list_del(&ioc->list); scsi_remove_host(shost); scsi_host_put(shost); |