diff options
Diffstat (limited to 'drivers/hid/uhid.c')
| -rw-r--r-- | drivers/hid/uhid.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c index 0cb92e34725..16af4d38239 100644 --- a/drivers/hid/uhid.c +++ b/drivers/hid/uhid.c @@ -172,13 +172,9 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum, spin_unlock_irqrestore(&uhid->qlock, flags); ret = wait_event_interruptible_timeout(uhid->report_wait, - atomic_read(&uhid->report_done), 5 * HZ); + atomic_read(&uhid->report_done) || !uhid->running, + 5 * HZ); - /* - * Make sure "uhid->running" is cleared on shutdown before - * "uhid->report_done" is set. - */ - smp_rmb(); if (!ret || !uhid->running) { ret = -EIO; } else if (ret < 0) { @@ -493,10 +489,7 @@ static int uhid_dev_destroy(struct uhid_device *uhid) if (!uhid->running) return -EINVAL; - /* clear "running" before setting "report_done" */ uhid->running = false; - smp_wmb(); - atomic_set(&uhid->report_done, 1); wake_up_interruptible(&uhid->report_wait); hid_destroy_device(uhid->hid); |