From: kashyap.desai@lsi.com Date: Thu, 4 Aug 2011 11:17:50 +0000 (+0530) Subject: SCSI: mpt2sas: Added missing mpt2sas_base_detach call from scsih_remove context X-Git-Tag: firefly_0821_release~7541^2~1975 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=18366c3fed0c372f9c123489e7061de11b640965;p=firefly-linux-kernel-4.4.55.git SCSI: mpt2sas: Added missing mpt2sas_base_detach call from scsih_remove context commit 9ae89b0296e275d5a556068b40b7c2557a556a85 upstream. mpt2sas_base_detach() call was removed from _scsih_remove() while doing some code shuffling. Mainly when we work on adding code for scsih_shutdown(). I have added back mpt2sas_base_detach() which will get callled from _scsih_remove(). Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley --- diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index f88e52a1a394..c79857e439f9 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c @@ -7211,6 +7211,7 @@ _scsih_remove(struct pci_dev *pdev) } sas_remove_host(shost); + mpt2sas_base_detach(ioc); list_del(&ioc->list); scsi_remove_host(shost); scsi_host_put(shost);