Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / mpt2sas / mpt2sas_base.c

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 82fa6ce481f0c131855667fbfda247d620cb2bfa..5e69f468535f243d200aaf1a6af31f4c8b9205cb 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -132,7 +132,7 @@ static int mpt2sas_remove_dead_ioc_func(void *arg)
                pdev = ioc->pdev;
                if ((pdev == NULL))
                        return -1;
-               pci_remove_bus_device(pdev);
+               pci_stop_and_remove_bus_device(pdev);
                return 0;
 }