summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2017-06-06 09:46:33 +0100
committerLee Jones <lee.jones@linaro.org>2017-06-06 10:17:42 +0100
commit27fef9f8ecb0495d302deba210606a32e54db37a (patch)
tree4f8953e484f211d20b86447a9d9d84801ab4e3ef
parent2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff)
downloadlinux-stable-27fef9f8ecb0495d302deba210606a32e54db37a.tar.gz
linux-stable-27fef9f8ecb0495d302deba210606a32e54db37a.tar.bz2
linux-stable-27fef9f8ecb0495d302deba210606a32e54db37a.zip
mfd: arizona: Fix typo using hard-coded register
A hardcoded register is accidentally used instead of the register address passed into the function. Correct this and use the appropriate variable. This would cause minor issues on wm5102, but all other devices using this driver would have been unaffected. Fixes: commit ef84f885e037 ("mfd: arizona: Refactor arizona_poll_reg") Reported-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/arizona-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 75488e65cd96..8d46e3ad9529 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -245,8 +245,7 @@ static int arizona_poll_reg(struct arizona *arizona,
int ret;
ret = regmap_read_poll_timeout(arizona->regmap,
- ARIZONA_INTERRUPT_RAW_STATUS_5, val,
- ((val & mask) == target),
+ reg, val, ((val & mask) == target),
ARIZONA_REG_POLL_DELAY_US,
timeout_ms * 1000);
if (ret)