Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[mirror_ubuntu-kernels.git] / drivers / scsi / pmcraid.c

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 321cf3ae863084d5f655f1dbe410fbca4c9ce75c..bcf858e88c64eb2e0c53ed49be6624259e11864c 100644 (file)
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -5454,7 +5454,7 @@ static void __devexit pmcraid_remove(struct pci_dev *pdev)
        pmcraid_shutdown(pdev);
 
        pmcraid_disable_interrupts(pinstance, ~0);
-       flush_scheduled_work();
+       flush_work_sync(&pinstance->worker_q);
 
        pmcraid_kill_tasklets(pinstance);
        pmcraid_unregister_interrupt_handler(pinstance);