diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2008-10-27 12:16:15 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-27 15:06:01 +0100 |
| commit | 3d5afd324a4bf9f64f59599bf1e93cd7dd1dc97a (patch) | |
| tree | 920b64f768d33c1534f6bdc37447f8b80494f9fa /drivers/hid/usbhid/usbhid.h | |
| parent | f8d56f1771e4867acc461146764b4feeb5245669 (diff) | |
| download | kernel_samsung_aries-3d5afd324a4bf9f64f59599bf1e93cd7dd1dc97a.zip kernel_samsung_aries-3d5afd324a4bf9f64f59599bf1e93cd7dd1dc97a.tar.gz kernel_samsung_aries-3d5afd324a4bf9f64f59599bf1e93cd7dd1dc97a.tar.bz2 | |
HID: fix oops during suspend of unbound HID devices
Usbhid structure is allocated on start invoked only from probe
of some driver. When there is no driver, the structure is null
and causes null-dereference oopses.
Fix it by allocating the structure on probe and disconnect of
the device itself. Also make sure we won't race between start
and resume or stop and suspend respectively.
References: http://bugzilla.kernel.org/show_bug.cgi?id=11827
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Andreas Schwab <schwab@suse.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid/usbhid.h')
| -rw-r--r-- | drivers/hid/usbhid/usbhid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h index abedb13..55973ff 100644 --- a/drivers/hid/usbhid/usbhid.h +++ b/drivers/hid/usbhid/usbhid.h @@ -27,6 +27,7 @@ #include <linux/types.h> #include <linux/slab.h> #include <linux/list.h> +#include <linux/mutex.h> #include <linux/timer.h> #include <linux/wait.h> #include <linux/workqueue.h> @@ -73,6 +74,7 @@ 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 */ |