diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-15 08:02:58 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-15 08:02:58 +0200 |
| commit | 91167e1914673972511617b6f4165bb12c3e0dcf (patch) | |
| tree | 0d8d2b997d3aef7dc23eaabadef51ab29de88d23 /drivers/input/touchscreen/edt-ft5x06.c | |
| parent | Input: joystick - use get_cycles on ARMv8 (diff) | |
| parent | Input: edt-ft5x06 - remove superfluous assignment (diff) | |
| download | linux-91167e1914673972511617b6f4165bb12c3e0dcf.tar.xz linux-91167e1914673972511617b6f4165bb12c3e0dcf.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 3.17.
Diffstat (limited to 'drivers/input/touchscreen/edt-ft5x06.c')
| -rw-r--r-- | drivers/input/touchscreen/edt-ft5x06.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index 5a6d50c004d7..8857d5b9be71 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -262,7 +262,6 @@ static int edt_ft5x06_register_write(struct edt_ft5x06_ts_data *tsdata, case M06: wrbuf[0] = tsdata->factory_mode ? 0xf3 : 0xfc; wrbuf[1] = tsdata->factory_mode ? addr & 0x7f : addr & 0x3f; - wrbuf[1] = tsdata->factory_mode ? addr & 0x7f : addr & 0x3f; wrbuf[2] = value; wrbuf[3] = wrbuf[0] ^ wrbuf[1] ^ wrbuf[2]; return edt_ft5x06_ts_readwrite(tsdata->client, 4, |