[patch 5/7] usbtouchscreen: fix NEXIO ACK and USB disconnect
From: akpm@linux-foundation.org
Date: 2010-02-02 22:43:27
From: Ondrej Zary <redacted> Fix sending ACK urbs and oops on USB disconnecting NEXIO touchscreen. Signed-off-by: Ondrej Zary <redacted> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Jim Persson <redacted> Cc: Florian Echtler <redacted> Cc: Dan Streetman <redacted> Cc: Daniel Ritz <redacted> Cc: Greg KH <redacted> Cc: Oliver Neukum <oliver@neukum.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- drivers/input/touchscreen/usbtouchscreen.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff -puN drivers/input/touchscreen/usbtouchscreen.c~usbtouchscreen-fix-nexio-ack-and-usb-disconnect drivers/input/touchscreen/usbtouchscreen.c
--- a/drivers/input/touchscreen/usbtouchscreen.c~usbtouchscreen-fix-nexio-ack-and-usb-disconnect
+++ a/drivers/input/touchscreen/usbtouchscreen.c@@ -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 *urb case -ECONNRESET: case -ENOENT: case -ESHUTDOWN: + case -EPIPE: /* this urb is terminated, clean up */ dbg("%s - urb shutting down with status: %d", __func__, urb->status);
_