Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7821578c authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[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: default avatarKashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent f93213de

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+1 −2
Original line number Diff line number Diff line
@@ -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);