diff options
| author | Lee Jones <lee.jones@linaro.org> | 2018-05-01 10:26:59 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2018-05-16 09:21:48 +0100 |
| commit | 1768391c3674b0c6bdc4947121f15fb0c2f47ec4 (patch) | |
| tree | 9a3634003cdc0672e4874f04078e21bf836cdae3 /drivers/mfd | |
| parent | 7169483ce4570bd2918cb7b1ab04c3e095a22713 (diff) | |
| download | linux-1768391c3674b0c6bdc4947121f15fb0c2f47ec4.tar.bz2 | |
mfd: tps65911-comparator: Fix an off by one bug
The COMP1 and COMP2 elements are in 0 and 1 respectively so this code is
accessing the wrong elements and one space beyond the end of the array.
The "id" variable is never COMP (0) so that code can be removed.
Fixes: 6851ad3ab346 ("TPS65911: Comparator: Add comparator driver")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/tps65911-comparator.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/mfd/tps65911-comparator.c b/drivers/mfd/tps65911-comparator.c index d223857fb4ad..33591767fb9b 100644 --- a/drivers/mfd/tps65911-comparator.c +++ b/drivers/mfd/tps65911-comparator.c @@ -22,9 +22,8 @@ #include <linux/gpio.h> #include <linux/mfd/tps65910.h> -#define COMP 0 -#define COMP1 1 -#define COMP2 2 +#define COMP1 0 +#define COMP2 1 /* Comparator 1 voltage selection table in millivolts */ static const u16 COMP_VSEL_TABLE[] = { @@ -63,9 +62,6 @@ static int comp_threshold_set(struct tps65910 *tps65910, int id, int voltage) int ret; u8 index = 0, val; - if (id == COMP) - return 0; - while (curr_voltage < tps_comp.uV_max) { curr_voltage = tps_comp.vsel_table[index]; if (curr_voltage >= voltage) @@ -89,9 +85,6 @@ static int comp_threshold_get(struct tps65910 *tps65910, int id) unsigned int val; int ret; - if (id == COMP) - return 0; - ret = tps65910_reg_read(tps65910, tps_comp.reg, &val); if (ret < 0) return ret; |