diff options
author | Luca Ceresoli <luca@lucaceresoli.net> | 2017-09-07 17:28:28 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-11 17:23:41 -0400 |
commit | 47014752829ed1b52fa6f876b381774ae530503c (patch) | |
tree | ab0ac28612c4920b26bcda337adf397eed563378 | |
parent | 4f1b461dd1dcb8f9333855cf7fa882fb9f068b16 (diff) |
Input: edt-ft5x06 - fix access to non-existing register
reg_addr->reg_report_rate is supposed to exist in M06, not M09.
The driver is written to skip avoids access to non-existing registers
when the register address is NO_REGISTER (0xff). But
reg_addr->reg_report_rate is initialized to 0x00 by devm_kzalloc() (in
edt_ft5x06_ts_probe()) and not changed thereafter. So the checks do
not work and an access to register 0x00 is done.
Fix by setting reg_addr->reg_report_rate to NO_REGISTER.
Also fix the only place where reg_report_rate is checked against zero
instead of NO_REGISTER.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/touchscreen/edt-ft5x06.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index f872817e81e4..5bf63f76ddda 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c | |||
@@ -593,7 +593,7 @@ static int edt_ft5x06_work_mode(struct edt_ft5x06_ts_data *tsdata) | |||
593 | tsdata->gain); | 593 | tsdata->gain); |
594 | edt_ft5x06_register_write(tsdata, reg_addr->reg_offset, | 594 | edt_ft5x06_register_write(tsdata, reg_addr->reg_offset, |
595 | tsdata->offset); | 595 | tsdata->offset); |
596 | if (reg_addr->reg_report_rate) | 596 | if (reg_addr->reg_report_rate != NO_REGISTER) |
597 | edt_ft5x06_register_write(tsdata, reg_addr->reg_report_rate, | 597 | edt_ft5x06_register_write(tsdata, reg_addr->reg_report_rate, |
598 | tsdata->report_rate); | 598 | tsdata->report_rate); |
599 | 599 | ||
@@ -874,6 +874,7 @@ edt_ft5x06_ts_set_regs(struct edt_ft5x06_ts_data *tsdata) | |||
874 | 874 | ||
875 | case M09: | 875 | case M09: |
876 | reg_addr->reg_threshold = M09_REGISTER_THRESHOLD; | 876 | reg_addr->reg_threshold = M09_REGISTER_THRESHOLD; |
877 | reg_addr->reg_report_rate = NO_REGISTER; | ||
877 | reg_addr->reg_gain = M09_REGISTER_GAIN; | 878 | reg_addr->reg_gain = M09_REGISTER_GAIN; |
878 | reg_addr->reg_offset = M09_REGISTER_OFFSET; | 879 | reg_addr->reg_offset = M09_REGISTER_OFFSET; |
879 | reg_addr->reg_num_x = M09_REGISTER_NUM_X; | 880 | reg_addr->reg_num_x = M09_REGISTER_NUM_X; |