From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jingoo Han Subject: Re: [patch v2] Input: edt-ft5x06 - add a missing condition Date: Thu, 03 Apr 2014 11:18:36 +0900 Message-ID: <000001cf4ee3$04d8e620$0e8ab260$%han@samsung.com> References: <002101cf4eda$184e85b0$48eb9110$%han@samsung.com> <20140403013712.GA28270@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mailout3.samsung.com ([203.254.224.33]:61214 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932512AbaDCCSi (ORCPT ); Wed, 2 Apr 2014 22:18:38 -0400 In-reply-to: <20140403013712.GA28270@mwanda> Content-language: ko Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: 'Dan Carpenter' , 'Dmitry Torokhov' Cc: =?iso-8859-1?Q?'Lothar_Wa=DFmann'?= , 'Henrik Rydberg' , 'Grant Likely' , 'Rob Herring' , 'Fugang Duan' , linux-input@vger.kernel.org, kernel-janitors@vger.kernel.org, 'Jingoo Han' On Thursday, April 03, 2014 10:37 AM, Dan Carpenter wrote: > > The if condition was accidentally deleted here so we return every time > instead of returning on error. > > Fixes: fd335ab04b3f ('Input: edt-ft5x06 - add support for M09 firmware version') > Signed-off-by: Dan Carpenter Reviewed-by: Jingoo Han Best regards, Jingoo Han > --- > v2: removed a stray tab character > > diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c > index 75b666b..9d0b324 100644 > --- a/drivers/input/touchscreen/edt-ft5x06.c > +++ b/drivers/input/touchscreen/edt-ft5x06.c > @@ -291,9 +291,10 @@ static int edt_ft5x06_register_read(struct edt_ft5x06_ts_data *tsdata, > wrbuf[1] = tsdata->factory_mode ? addr & 0x7f : addr & 0x3f; > wrbuf[1] |= tsdata->factory_mode ? 0x80 : 0x40; > > - error = edt_ft5x06_ts_readwrite(tsdata->client, > - 2, wrbuf, 2, rdbuf); > - return error; > + error = edt_ft5x06_ts_readwrite(tsdata->client, 2, wrbuf, 2, > + rdbuf); > + if (error) > + return error; > > if ((wrbuf[0] ^ wrbuf[1] ^ rdbuf[0]) != rdbuf[1]) { > dev_err(&tsdata->client->dev,