From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Hutterer Subject: Re: [PATCH 2/2] Input: wacom_w8001 - Ignore invalid pen data packets Date: Tue, 24 May 2016 15:04:35 +1000 Message-ID: <20160524050435.GB11910@jelly> References: <1464059067-6244-1-git-send-email-pingc@wacom.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from leo.clearchain.com ([199.73.29.74]:30062 "EHLO mail.clearchain.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753140AbcEXFEl (ORCPT ); Tue, 24 May 2016 01:04:41 -0400 Content-Disposition: inline In-Reply-To: <1464059067-6244-1-git-send-email-pingc@wacom.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Ping Cheng Cc: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, benjamin.tissoires@gmail.com, Ping Cheng On Mon, May 23, 2016 at 08:04:27PM -0700, Ping Cheng wrote: > ThinkPad X60 Tablet PC (pen only device) sometime posts > packets that are larger than W8001_PKTLEN_TPCPEN. > > Reported-by: Chris J Arges > Tested-by: Chris J Arges > Signed-off-by: Ping Cheng Reviewed-by: Peter Hutterer Cheers, Peter > --- > drivers/input/touchscreen/wacom_w8001.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c > index b1b4127..d5dcda2 100644 > --- a/drivers/input/touchscreen/wacom_w8001.c > +++ b/drivers/input/touchscreen/wacom_w8001.c > @@ -339,6 +339,15 @@ static irqreturn_t w8001_interrupt(struct serio *serio, > w8001->idx = 0; > parse_multi_touch(w8001); > break; > + > + default: > + /* > + * ThinkPad X60 Tablet PC (pen only device) sometime sends > + * invalid data packets that are larger than W8001_PKTLEN_TPCPEN. > + * Let's start over again. > + */ > + if (!w8001->touch_dev && w8001->idx > W8001_PKTLEN_TPCPEN - 1) > + w8001->idx = 0; > } > > return IRQ_HANDLED; > -- > 1.9.1