From: akpm@linux-foundation.org
To: dtor@mail.ru
Cc: linux-input@vger.kernel.org, akpm@linux-foundation.org,
linux@rainbow-software.org, daniel.ritz@gmx.ch,
ddstreet@ieee.org, dmitry.torokhov@gmail.com,
floe@butterbrot.org, greg@kroah.com, jim-linux@nurd.se,
oliver@neukum.org
Subject: [patch 6/8] usbtouchscreen: fix NEXIO ACK and USB disconnect
Date: Mon, 21 Dec 2009 16:23:04 -0800 [thread overview]
Message-ID: <200912220023.nBM0N4nH005053@imap1.linux-foundation.org> (raw)
From: Ondrej Zary <linux@rainbow-software.org>
Fix sending ACK urbs and oops on USB disconnecting NEXIO touchscreen.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Jim Persson <jim-linux@nurd.se>
Cc: Florian Echtler <floe@butterbrot.org>
Cc: Dan Streetman <ddstreet@ieee.org>
Cc: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Greg KH <greg@kroah.com>
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);
_
reply other threads:[~2009-12-22 0:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200912220023.nBM0N4nH005053@imap1.linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=daniel.ritz@gmx.ch \
--cc=ddstreet@ieee.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dtor@mail.ru \
--cc=floe@butterbrot.org \
--cc=greg@kroah.com \
--cc=jim-linux@nurd.se \
--cc=linux-input@vger.kernel.org \
--cc=linux@rainbow-software.org \
--cc=oliver@neukum.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.