Merge branch 'linus' into core/locking

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index abedb13c623e..55973ff54008 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 */