git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
drivers
/
scsi
/
pmcraid.c
diff --git
a/drivers/scsi/pmcraid.c
b/drivers/scsi/pmcraid.c
index
321cf3a
..
bcf858e
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);
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);
pmcraid_kill_tasklets(pinstance);
pmcraid_unregister_interrupt_handler(pinstance);