projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d93d16e
)
usb: cdc-wdm: Fix deadlock between write and resume
author
Oliver Neukum
<oliver@neukum.org>
Sat, 27 Feb 2010 19:57:12 +0000
(20:57 +0100)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Fri, 19 Mar 2010 14:24:17 +0000
(07:24 -0700)
The new runtime PM scheme allows resume() to have no locks.
This fixes the deadlock.
Signed-off-by: Oliver Neukum <neukum@b1-systems.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/class/cdc-wdm.c
patch
|
blob
|
history
diff --git
a/drivers/usb/class/cdc-wdm.c
b/drivers/usb/class/cdc-wdm.c
index
b574905
..
189141c
100644
(file)
--- a/
drivers/usb/class/cdc-wdm.c
+++ b/
drivers/usb/class/cdc-wdm.c
@@
-839,10
+839,10
@@
static int wdm_resume(struct usb_interface *intf)
int rv;
dev_dbg(&desc->intf->dev, "wdm%d_resume\n", intf->minor);
- mutex_lock(&desc->lock);
+
clear_bit(WDM_SUSPENDING, &desc->flags);
rv = recover_from_urb_loss(desc);
- mutex_unlock(&desc->lock);
+
return rv;
}
#endif