diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-06 15:13:01 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-10-04 15:48:05 +0100 |
| commit | fae5e033d65a03c8b705be8ffc0ef69162544368 (patch) | |
| tree | f0eddbf0abf98cb532b6856bb01b9780d5cf96c9 | |
| parent | b4feabe917ee6995c80e2a53b84946d606e78e89 (diff) | |
| download | linux-fae5e033d65a03c8b705be8ffc0ef69162544368.tar.bz2 | |
mfd: rk808: Fix RK818_IRQ_DISCHG_ILIM initializer
When building with -Woverride-init, we get a warning about an incorrect
initializer:
drivers/mfd/rk808.c:244:8: error: initialized field overwritten [-Werror=override-init]
[RK818_IRQ_DISCHG_ILIM] = {
This is clearly a mistake, as both RK818_IRQ_DISCHG_ILIM and RK818_IRQ_USB_OV
are defined as '7', but they refer to different register bits. Changing
RK818_IRQ_DISCHG_ILIM to 15 is consistent with how all other 14 interrupts are
handled here, so I'm assuming this is what it should have been.
Fixes: 2eedcbfc0612 ("mfd: rk808: Add RK818 support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | include/linux/mfd/rk808.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h index fc5db6fcb57d..6d435a3c06bc 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -244,7 +244,7 @@ enum rk818_reg { #define RK818_IRQ_CHG_TS1 12 #define RK818_IRQ_TS2 13 #define RK818_IRQ_CHG_CVTLIM 14 -#define RK818_IRQ_DISCHG_ILIM 7 +#define RK818_IRQ_DISCHG_ILIM 15 #define RK818_IRQ_VOUT_LO_MSK BIT(0) #define RK818_IRQ_VB_LO_MSK BIT(1) |