2012-05-10 15:35:15

by Axel Lin

Subject: [PATCH] mfd: lm3533-core: Fix calling regmap_update_bits() with mask and val arguments swapped

Current code calls regmap_update_bits() with mask and val arguments swapped.
Fix it.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/mfd/lm3533-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
index 75f4b7f..4a006c2 100644
--- a/drivers/mfd/lm3533-core.c
+++ b/drivers/mfd/lm3533-core.c
@@ -128,7 +128,7 @@ int lm3533_update(struct lm3533 *lm3533, u8 reg, u8 val, u8 mask)

dev_dbg(lm3533->dev, "update [%02x]: %02x/%02x\n", reg, val, mask);

- ret = regmap_update_bits(lm3533->regmap, reg, val, mask);
+ ret = regmap_update_bits(lm3533->regmap, reg, mask, val);
if (ret < 0) {
dev_err(lm3533->dev, "failed to update register %02x: %d\n",
reg, ret);
--
1.7.5.4

2012-05-10 15:49:29

by Johan Hovold

Subject: Re: [PATCH] mfd: lm3533-core: Fix calling regmap_update_bits() with mask and val arguments swapped

On Thu, May 10, 2012 at 11:35:02PM +0800, Axel Lin wrote:
> Current code calls regmap_update_bits() with mask and val arguments swapped.
> Fix it.
>
> Signed-off-by: Axel Lin <[email protected]>

Signed-off-by: Johan Hovold <[email protected]>

> ---

Ouch, I was sure I'd fixed that in the submitted v2.

/Johan


> drivers/mfd/lm3533-core.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/lm3533-core.c b/drivers/mfd/lm3533-core.c
> index 75f4b7f..4a006c2 100644
> --- a/drivers/mfd/lm3533-core.c
> +++ b/drivers/mfd/lm3533-core.c
> @@ -128,7 +128,7 @@ int lm3533_update(struct lm3533 *lm3533, u8 reg, u8 val, u8 mask)
>
> dev_dbg(lm3533->dev, "update [%02x]: %02x/%02x\n", reg, val, mask);
>
> - ret = regmap_update_bits(lm3533->regmap, reg, val, mask);
> + ret = regmap_update_bits(lm3533->regmap, reg, mask, val);
> if (ret < 0) {
> dev_err(lm3533->dev, "failed to update register %02x: %d\n",
> reg, ret);

2012-05-11 13:27:14

by Samuel Ortiz

Subject: Re: [PATCH] mfd: lm3533-core: Fix calling regmap_update_bits() with mask and val arguments swapped

Hi Johan, Axel,

On Thu, May 10, 2012 at 05:49:25PM +0200, Johan Hovold wrote:
> On Thu, May 10, 2012 at 11:35:02PM +0800, Axel Lin wrote:
> > Current code calls regmap_update_bits() with mask and val arguments swapped.
> > Fix it.
> >
> > Signed-off-by: Axel Lin <[email protected]>
>
> Signed-off-by: Johan Hovold <[email protected]>
Rather Acked-by.
I applied this patch.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/