| Message ID | 20140403013712.GA28270@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <dan.carpenter@oracle.com> Reviewed-by: Jingoo Han <jg1.han@samsung.com> 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, -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, 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 <dan.carpenter@oracle.com> > --- > 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, > Acked-By: Lothar Waßmann <LW@KARO-electronics.de> Lothar Waßmann
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,
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 <dan.carpenter@oracle.com> --- v2: removed a stray tab character -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html