diff options
| author | Aleksey Kuleshov <rndfax@yandex.ru> | 2016-03-09 13:17:52 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-10 10:00:01 +0100 |
| commit | 504c511e4ac0fe67ca0126507509b7e7e995751b (patch) | |
| tree | 3477ab81d6604b0f10da4266fdd3a59fdb7b3619 /drivers/input | |
| parent | b73e1479d62bed0d4de1b26fef069dbc9190a129 (diff) | |
| download | barebox-504c511e4ac0fe67ca0126507509b7e7e995751b.tar.gz barebox-504c511e4ac0fe67ca0126507509b7e7e995751b.tar.xz | |
usb_kbd: lock is useless since pollers are atomic
Signed-off-by: Aleksey Kuleshov <rndfax@yandex.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/usb_kbd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/input/usb_kbd.c b/drivers/input/usb_kbd.c index bdaf305781..2acc95d9fd 100644 --- a/drivers/input/usb_kbd.c +++ b/drivers/input/usb_kbd.c @@ -50,7 +50,6 @@ struct usb_kbd_pdata { uint8_t old[USB_KBD_BOOT_REPORT_SIZE]; struct poller_async poller; struct usb_device *usbdev; - int lock; unsigned long intpipe; int intpktsize; int intinterval; @@ -98,16 +97,11 @@ static void usb_kbd_poll(void *arg) struct usb_device *usbdev = data->usbdev; int ret, i; - if (data->lock) - return; - - data->lock = 1; - ret = data->do_poll(data); if (ret == -EAGAIN) goto exit; if (ret < 0) { - /* exit and lock forever */ + /* exit with noreturn */ dev_err(&usbdev->dev, "usb_submit_int_msg() failed. Keyboard disconnect?\n"); return; @@ -144,7 +138,6 @@ static void usb_kbd_poll(void *arg) memcpy(data->old, data->new, USB_KBD_BOOT_REPORT_SIZE); exit: - data->lock = 0; poller_call_async(&data->poller, data->intinterval * MSECOND, usb_kbd_poll, data); } |