usbtouchscreen: fix NEXIO ACK and USB disconnect
Subsystems (2)
PATCH 5/7 usbtouchscreen: fix NEXIO ACK and USB disconnect
From: Ondrej Zary <[email protected]>
Fix sending ACK urbs and oops on USB disconnecting NEXIO touchscreen.
Signed-off-by Ondrej Zary <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Jim Persson <[email protected]>
Cc Florian Echtler <[email protected]>
Cc Dan Streetman <[email protected]>
Cc Daniel Ritz <[email protected]>
Cc Greg KH <[email protected]>
Cc Oliver Neukum <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/input/touchscreen/usbtouchscreen.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/input/touchscreen/usbtouchscreen.c renamed from drivers/input/touchscreen/usbtouchscreen.c~usbtouchscreen-fix-nexio-ack-and-usb-disconnect +7 -2
@@ -728,6 +728,10 @@ struct nexio_touch_packet {static unsigned char nexio_ack_pkt[2 ] = {0xaa ,0x02 };static unsigned char nexio_init_pkt[4 ] = {0x82 ,0x04 ,0x0a ,0x0f }; +static void nexio_ack_complete (struct urb *urb) +{ +} +static int nexio_init (struct usbtouch_usb *usbtouch) {struct usb_device *dev =interface_to_usbdev (usbtouch->interface);
@@ -811,8 +815,8 @@ static int nexio_init(struct usbtouch_us goto err_ack_buf; }usb_fill_bulk_urb (priv->ack, dev,usb_sndbulkpipe (dev, output_ep), - priv->ack_buf,sizeof (priv->ack_buf),NULL , - usbtouch); + priv->ack_buf,sizeof (nexio_ack_pkt), + nexio_ack_complete, usbtouch); ret =0 ; goto out_buf; err_ack_buf:
@@ -1227,6 +1231,7 @@ static void usbtouch_irq(struct urb *urbcase -ECONNRESET :case -ENOENT :case -ESHUTDOWN : +case -EPIPE :/* this urb is terminated, clean up */ dbg ("%s - urb shutting down with status: %d" , __func__, urb->status);
_