[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>

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);