]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Input: edt-ft5x06 - add a missing condition
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 3 Apr 2014 16:17:05 +0000 (09:17 -0700)
committerLothar Waßmann <LW@KARO-electronics.de>
Wed, 30 Apr 2014 10:55:46 +0000 (12:55 +0200)
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>
Acked-By: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/edt-ft5x06.c

index 198a235b137f8e9742a72a686a90da8a56dd1974..e351fd90a8c3130339ff68fec4f995a2c3d861f7 100644 (file)
@@ -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,