mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 09:41:44 +00:00
[SCSI] mptfusion: mpt_detach is called properly at the time of rmmod
Current design of mptsas is as follow. MPTSAS will do probe() if pci id matches for available card in system, irrespective of mode of controller. If controller is I/T mode or I mode, things are fine. If controller is only in T mode, mptsas is not doing complete process of mptsas_probe(). It will only make sure IOC structure is created and IOC reference is available for mptstm driver. Now While removing module we should take care case of Target mode only mptsas. If we are removing IOC which is only in Target mode, We should only detach IOC instead of following rest of the cleanup process which is only required for T mode controller. Now For T mode controller, only part clean up is done instead of complete cleanup. mpt_detach will call early in case of Target mode only controller. Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
b3b97316d5
commit
48959f1eae
@ -5073,6 +5073,12 @@ static void __devexit mptsas_remove(struct pci_dev *pdev)
|
||||
struct mptsas_portinfo *p, *n;
|
||||
int i;
|
||||
|
||||
if (!ioc->sh) {
|
||||
printk(MYIOC_s_INFO_FMT "IOC is in Target mode\n", ioc->name);
|
||||
mpt_detach(pdev);
|
||||
return;
|
||||
}
|
||||
|
||||
mptsas_shutdown(pdev);
|
||||
|
||||
mptsas_del_device_components(ioc);
|
||||
|
@ -1149,11 +1149,6 @@ mptscsih_remove(struct pci_dev *pdev)
|
||||
MPT_SCSI_HOST *hd;
|
||||
int sz1;
|
||||
|
||||
if(!host) {
|
||||
mpt_detach(pdev);
|
||||
return;
|
||||
}
|
||||
|
||||
scsi_remove_host(host);
|
||||
|
||||
if((hd = shost_priv(host)) == NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user