Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils

[mv-sheeva.git] / drivers / message / fusion / mptbase.c

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index a7dc4672d996c5e67bb112371e92bfd634f2d1c7..a5c591ffe395d01b6e7e09f927c03f3048688620 100644 (file)
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -346,7 +346,7 @@ static int mpt_remove_dead_ioc_func(void *arg)
        if ((pdev == NULL))
                return -1;
 
-       pci_remove_bus_device(pdev);
+       pci_stop_and_remove_bus_device(pdev);
        return 0;
 }