summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Mamonov <pmamonov@gmail.com>2017-03-23 00:38:03 +0300
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-24 07:15:30 +0100
commitf4ea4a134b1cd48d45575ea31539afb3d281ae37 (patch)
tree824d7aa113e6f334d0201b29bc368848e5ce129a
parent9df009de996436ef6a1dc293f391e4f4bd2a3a27 (diff)
downloadbarebox-f4ea4a134b1cd48d45575ea31539afb3d281ae37.tar.gz
barebox-f4ea4a134b1cd48d45575ea31539afb3d281ae37.tar.xz
usb_kbd: release all keys on error / disconnect
Signed-off-by: Peter Mamonov <pmamonov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/input/usb_kbd.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/input/usb_kbd.c b/drivers/input/usb_kbd.c
index 2acc95d9fd..a2b92c2856 100644
--- a/drivers/input/usb_kbd.c
+++ b/drivers/input/usb_kbd.c
@@ -58,6 +58,14 @@ struct usb_kbd_pdata {
struct input_device input;
};
+static void usb_kbd_release_all_keys(struct usb_kbd_pdata *data)
+{
+ int i;
+
+ for (i = 0; i <= KEY_MAX; i++)
+ input_report_key_event(&data->input, i, 0);
+}
+
static int usb_kbd_int_poll(struct usb_kbd_pdata *data)
{
return usb_submit_int_msg(data->usbdev, data->intpipe, data->new,
@@ -98,6 +106,8 @@ static void usb_kbd_poll(void *arg)
int ret, i;
ret = data->do_poll(data);
+ if (ret < 0)
+ usb_kbd_release_all_keys(data);
if (ret == -EAGAIN)
goto exit;
if (ret < 0) {
@@ -209,6 +219,7 @@ static void usb_kbd_disconnect(struct usb_device *usbdev)
{
struct usb_kbd_pdata *data = usbdev->drv_data;
+ usb_kbd_release_all_keys(data);
poller_async_unregister(&data->poller);
input_device_unregister(&data->input);
dma_free(data->new);