diff options
| author |   Hannes Reinecke <hare@suse.de> | 2017-04-24 11:22:32 +0200 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2017-04-24 18:21:17 -0400 |
| commit | cfd2aff711aa9de301258d322a0b5a3c64010220 (patch) | |
| tree | 272fcc093819b7881cce53fa3c5c05a1242c8909 /drivers/message/fusion/mptspi.c | |
| parent | scsi: sg: reset 'res_in_use' after unlinking reserved array (diff) | |
| download | wireguard-linux-cfd2aff711aa9de301258d322a0b5a3c64010220.tar.xz wireguard-linux-cfd2aff711aa9de301258d322a0b5a3c64010220.zip | |
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>
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
| -rw-r--r-- | drivers/message/fusion/mptspi.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 031e088edb5e..9a336a161d9f 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -1548,11 +1548,19 @@ out_mptspi_probe: return error; } +static void mptspi_remove(struct pci_dev *pdev) +{ + MPT_ADAPTER *ioc = pci_get_drvdata(pdev); + + scsi_remove_host(ioc->sh); + mptscsih_remove(pdev); +} + static struct pci_driver mptspi_driver = { .name = "mptspi", .id_table = mptspi_pci_table, .probe = mptspi_probe, - .remove = mptscsih_remove, + .remove = mptspi_remove, .shutdown = mptscsih_shutdown, #ifdef CONFIG_PM .suspend = mptscsih_suspend, |