Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: mpt: Move scsi_remove_host() out of mptscsih_remove_host()

Commit c5ce0abeb628 ("scsi: sas: move scsi_remove_host call...") moved
the call to scsi_remove_host() into sas_remove_host(), but forgot to
modify the mpt drivers.

Fixes: c5ce0abeb628 ("scsi: sas: move scsi_remove_host call into sas_remove_host")
Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Hannes Reinecke and committed by
Martin K. Petersen
cfd2aff7 e791ce27

+15 -4
+6 -1
drivers/message/fusion/mptfc.c
··· 1329 1329 WQ_MEM_RECLAIM); 1330 1330 if (!ioc->fc_rescan_work_q) { 1331 1331 error = -ENOMEM; 1332 - goto out_mptfc_probe; 1332 + goto out_mptfc_host; 1333 1333 } 1334 1334 1335 1335 /* ··· 1350 1350 flush_workqueue(ioc->fc_rescan_work_q); 1351 1351 1352 1352 return 0; 1353 + 1354 + out_mptfc_host: 1355 + scsi_remove_host(sh); 1353 1356 1354 1357 out_mptfc_probe: 1355 1358 ··· 1532 1529 ioc->fc_data.fc_port_page1[ii].data = NULL; 1533 1530 } 1534 1531 } 1532 + 1533 + scsi_remove_host(ioc->sh); 1535 1534 1536 1535 mptscsih_remove(pdev); 1537 1536 }
-2
drivers/message/fusion/mptscsih.c
··· 1176 1176 MPT_SCSI_HOST *hd; 1177 1177 int sz1; 1178 1178 1179 - scsi_remove_host(host); 1180 - 1181 1179 if((hd = shost_priv(host)) == NULL) 1182 1180 return; 1183 1181
+9 -1
drivers/message/fusion/mptspi.c
··· 1548 1548 return error; 1549 1549 } 1550 1550 1551 + static void mptspi_remove(struct pci_dev *pdev) 1552 + { 1553 + MPT_ADAPTER *ioc = pci_get_drvdata(pdev); 1554 + 1555 + scsi_remove_host(ioc->sh); 1556 + mptscsih_remove(pdev); 1557 + } 1558 + 1551 1559 static struct pci_driver mptspi_driver = { 1552 1560 .name = "mptspi", 1553 1561 .id_table = mptspi_pci_table, 1554 1562 .probe = mptspi_probe, 1555 - .remove = mptscsih_remove, 1563 + .remove = mptspi_remove, 1556 1564 .shutdown = mptscsih_shutdown, 1557 1565 #ifdef CONFIG_PM 1558 1566 .suspend = mptscsih_suspend,