projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[cascardo/linux.git]
/
drivers
/
ata
/
libata-core.c
diff --git
a/drivers/ata/libata-core.c
b/drivers/ata/libata-core.c
index
f23d6d4
..
0a6a943
100644
(file)
--- a/
drivers/ata/libata-core.c
+++ b/
drivers/ata/libata-core.c
@@
-6128,7
+6128,7
@@
static void ata_port_detach(struct ata_port *ap)
/* it better be dead now */
WARN_ON(!(ap->pflags & ATA_PFLAG_UNLOADED));
- cancel_
rearming_delayed_work
(&ap->hotplug_task);
+ cancel_
delayed_work_sync
(&ap->hotplug_task);
skip_eh:
if (ap->pmp_link) {