diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-18 19:02:39 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-18 19:02:39 +0100 |
| commit | 6d32af019a45654b6eb3ae2ff17d51ba1f045bb4 (patch) | |
| tree | 17d232cb65248c68b86aaec475f576b5134079e2 /drivers/input/touchscreen | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | Input: alps - v7: document the v7 touchpad packet protocol (diff) | |
| download | linux-6d32af019a45654b6eb3ae2ff17d51ba1f045bb4.tar.xz linux-6d32af019a45654b6eb3ae2ff17d51ba1f045bb4.zip | |
Merge branch 'next' into for-linus
Second round of input updates for 3.19.
Diffstat (limited to 'drivers/input/touchscreen')
| -rw-r--r-- | drivers/input/touchscreen/edt-ft5x06.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index 2e4d90919f4b..dcc68efd0d7f 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -850,9 +850,11 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client, } #define EDT_ATTR_CHECKSET(name, reg) \ +do { \ if (pdata->name >= edt_ft5x06_attr_##name.limit_low && \ pdata->name <= edt_ft5x06_attr_##name.limit_high) \ - edt_ft5x06_register_write(tsdata, reg, pdata->name) + edt_ft5x06_register_write(tsdata, reg, pdata->name); \ +} while (0) #define EDT_GET_PROP(name, reg) { \ u32 val; \ |