Skip to contentSkip to conversation

usb_kbd: release all keys on error / disconnect

PATCH Applied Peter Mamonov 2 participants 2 messages Mar 22, 2017 – Mar 24, 2017 Input drivers

lore
Share & tools
lore

Peter Mamonov

author
#0 lore raw

PATCH 1/1 usb_kbd: release all keys on error / disconnect

Signed-off-by Peter Mamonov <[email protected]>
---
 drivers/input/usb_kbd.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/input/usb_kbd.c +11 -0
index 2acc95d9f..a2b92c285 100644
@@ -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);
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Applied
#1 lore raw
Quoted 4 lines · Peter Mamonov
Signed-off-by Peter Mamonov <[email protected]>
---
 drivers/input/usb_kbd.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Applied, thanks

Sascha

Quoted 46 lines
drivers/input/usb_kbd.c +11 -0
index 2acc95d9f..a2b92c285 100644
@@ -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);
Signature · 7 lines
2.11.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox