diff options
author | Peter Zijlstra <peterz@infradead.org> | 2020-05-19 20:34:12 +0200 |
---|---|---|
committer | Peter Zijlstra <peterz@infradead.org> | 2020-05-19 20:34:12 +0200 |
commit | 9013196a467e770e1470cccee6c0fe435ef37c66 (patch) | |
tree | 2aefbb9d14a1a7513af9e752fe5bb80cf6b00c0c /drivers/hid/usbhid/usbhid.h | |
parent | 2a0a24ebb499c9d499eea948d3fc108f936e36d4 (diff) | |
parent | 39f23ce07b9355d05a64ae303ce20d1c4b92b957 (diff) | |
download | linux-9013196a467e770e1470cccee6c0fe435ef37c66.tar.bz2 |
Merge branch 'sched/urgent'
Diffstat (limited to 'drivers/hid/usbhid/usbhid.h')
-rw-r--r-- | drivers/hid/usbhid/usbhid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h index 8620408bd7af..75fe85d3d27a 100644 --- a/drivers/hid/usbhid/usbhid.h +++ b/drivers/hid/usbhid/usbhid.h @@ -80,6 +80,7 @@ struct usbhid_device { dma_addr_t outbuf_dma; /* Output buffer dma */ unsigned long last_out; /* record of last output for timeouts */ + struct mutex mutex; /* start/stop/open/close */ spinlock_t lock; /* fifo spinlock */ unsigned long iofl; /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */ struct timer_list io_retry; /* Retry timer */ |