aboutsummaryrefslogtreecommitdiff
path: root/drivers/hid/usbhid/usbhid.h
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-11-23 12:03:20 +0100
committerJiri Kosina <jkosina@suse.cz>2008-11-23 12:03:20 +0100
commitfde5be353e872fe6088d2b1951e56cdfda2042ff (patch)
tree31e3851f334761ec945fca5d11ba34012b1b59d7 /drivers/hid/usbhid/usbhid.h
parent578f3a35fecabff49bad808c5301313f785b5462 (diff)
HID: remove setup mutex, fix possible deadlock
It causes recursive locking warning and is unneeded after introduction of STARTED flag. * Resume vs. stop is effectively solved by DISCONNECT flag. * No problem in suspend vs. start -- urb is submitted even after open which is possible after connect which is called after start. * Resume vs. start solved by STARTED flag. * Suspend vs. stop -- no problem in killing urb and timer twice. Reported-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid/usbhid.h')
-rw-r--r--drivers/hid/usbhid/usbhid.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index 55973ff5400..332abcdf995 100644
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -74,7 +74,6 @@ struct usbhid_device {
dma_addr_t outbuf_dma; /* Output buffer dma */
spinlock_t outlock; /* Output fifo spinlock */
- struct mutex setup;
unsigned long iofl; /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */
struct timer_list io_retry; /* Retry timer */
unsigned long stop_retry; /* Time to give up, in jiffies */