2017-06-06 08:45:56

by Charles Keepax

Subject: [PATCH RESEND] 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 <[email protected]>
Signed-off-by: Charles Keepax <[email protected]>
---
drivers/mfd/arizona-core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 75488e6..8d46e3a 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)
--
2.1.4

2017-06-06 09:16:06

by Lee Jones

Subject: Re: [PATCH RESEND] mfd: arizona: Fix typo using hard-coded register

On Tue, 06 Jun 2017, Charles Keepax wrote:

> 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 <[email protected]>
> Signed-off-by: Charles Keepax <[email protected]>
> ---
> drivers/mfd/arizona-core.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index 75488e6..8d46e3a 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)

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog