* [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
@ 2011-08-29 14:48 Axel Lin
2011-08-29 14:50 ` [PATCH 2/2 RESEND] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
2011-08-31 13:26 ` [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Liam Girdwood
0 siblings, 2 replies; 9+ messages in thread
From: Axel Lin @ 2011-08-29 14:48 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz, Liam Girdwood, Mark Brown, Jin Park
In current implementation, the pointer ri is not NULL if no id is matched.
Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/regulator/aat2870-regulator.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index cd41045..11d1ab4 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
break;
}
- if (!ri)
+ if (i == ARRAY_SIZE(aat2870_regulators))
return NULL;
ri->enable_addr = AAT2870_LDO_EN;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2 RESEND] regulator: aat2870: Remove a redundant bitwise and operation
2011-08-29 14:48 [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
@ 2011-08-29 14:50 ` Axel Lin
2011-08-31 13:26 ` [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Liam Girdwood
1 sibling, 0 replies; 9+ messages in thread
From: Axel Lin @ 2011-08-29 14:50 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz, Liam Girdwood, Mark Brown, Jin Park
The implementation in aat2870_update() already did the bitwise and operation
against mask parameter.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/regulator/aat2870-regulator.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index 11d1ab4..c8ea28e 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -62,7 +62,7 @@ static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,
struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
return aat2870->update(aat2870, ri->voltage_addr, ri->voltage_mask,
- (selector << ri->voltage_shift) & ri->voltage_mask);
+ selector << ri->voltage_shift);
}
static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)
--
1.7.4.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-08-29 14:48 [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
2011-08-29 14:50 ` [PATCH 2/2 RESEND] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
@ 2011-08-31 13:26 ` Liam Girdwood
1 sibling, 0 replies; 9+ messages in thread
From: Liam Girdwood @ 2011-08-31 13:26 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Samuel Ortiz, Mark Brown, Jin Park
On 29/08/11 15:48, Axel Lin wrote:
> In current implementation, the pointer ri is not NULL if no id is matched.
> Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> drivers/regulator/aat2870-regulator.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
> index cd41045..11d1ab4 100644
> --- a/drivers/regulator/aat2870-regulator.c
> +++ b/drivers/regulator/aat2870-regulator.c
> @@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
> break;
> }
>
> - if (!ri)
> + if (i == ARRAY_SIZE(aat2870_regulators))
> return NULL;
>
> ri->enable_addr = AAT2870_LDO_EN;
Both applied.
Thanks
Liam
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
@ 2011-07-06 23:38 Axel Lin
2011-07-29 16:05 ` Axel Lin
0 siblings, 1 reply; 9+ messages in thread
From: Axel Lin @ 2011-07-06 23:38 UTC (permalink / raw)
To: linux-kernel; +Cc: Jin Park, Liam Girdwood, Mark Brown, Samuel Ortiz
In current implementation, the pointer ri is not NULL if no id is matched.
Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/regulator/aat2870-regulator.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
index cd41045..11d1ab4 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
break;
}
- if (!ri)
+ if (i == ARRAY_SIZE(aat2870_regulators))
return NULL;
ri->enable_addr = AAT2870_LDO_EN;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-07-06 23:38 Axel Lin
@ 2011-07-29 16:05 ` Axel Lin
2011-07-29 16:10 ` Liam Girdwood
0 siblings, 1 reply; 9+ messages in thread
From: Axel Lin @ 2011-07-29 16:05 UTC (permalink / raw)
To: linux-kernel; +Cc: Jin Park, Liam Girdwood, Mark Brown, Samuel Ortiz
hi,
Seems this 2 patches are not upstream. Should I resend it again?
Regards,
Axel
2011/7/7 Axel Lin <axel.lin@gmail.com>:
> In current implementation, the pointer ri is not NULL if no id is matched.
> Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> drivers/regulator/aat2870-regulator.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
> index cd41045..11d1ab4 100644
> --- a/drivers/regulator/aat2870-regulator.c
> +++ b/drivers/regulator/aat2870-regulator.c
> @@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
> break;
> }
>
> - if (!ri)
> + if (i == ARRAY_SIZE(aat2870_regulators))
> return NULL;
>
> ri->enable_addr = AAT2870_LDO_EN;
> --
> 1.7.4.1
>
>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-07-29 16:05 ` Axel Lin
@ 2011-07-29 16:10 ` Liam Girdwood
2011-08-10 15:19 ` Axel Lin
0 siblings, 1 reply; 9+ messages in thread
From: Liam Girdwood @ 2011-07-29 16:10 UTC (permalink / raw)
To: axel.lin; +Cc: linux-kernel, Jin Park, Mark Brown, Samuel Ortiz
On Fri, 2011-07-29 at 18:05 +0200, Axel Lin wrote:
> hi,
> Seems this 2 patches are not upstream. Should I resend it again?
> Regards,
> Axel
Not required atm thanks, this driver went via mfd so I can apply the fix
after the mfd merge or rc1.
Liam
>
> 2011/7/7 Axel Lin <axel.lin@gmail.com>:
> > In current implementation, the pointer ri is not NULL if no id is matched.
> > Fix it by checking i == ARRAY_SIZE(aat2870_regulators) if no id is matched.
> >
> > Signed-off-by: Axel Lin <axel.lin@gmail.com>
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> > ---
> > drivers/regulator/aat2870-regulator.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c
> > index cd41045..11d1ab4 100644
> > --- a/drivers/regulator/aat2870-regulator.c
> > +++ b/drivers/regulator/aat2870-regulator.c
> > @@ -159,7 +159,7 @@ static struct aat2870_regulator *aat2870_get_regulator(int id)
> > break;
> > }
> >
> > - if (!ri)
> > + if (i == ARRAY_SIZE(aat2870_regulators))
> > return NULL;
> >
> > ri->enable_addr = AAT2870_LDO_EN;
> > --
> > 1.7.4.1
> >
> >
> >
> >
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-07-29 16:10 ` Liam Girdwood
@ 2011-08-10 15:19 ` Axel Lin
2011-08-10 21:31 ` Liam Girdwood
0 siblings, 1 reply; 9+ messages in thread
From: Axel Lin @ 2011-08-10 15:19 UTC (permalink / raw)
To: Liam Girdwood; +Cc: linux-kernel, Jin Park, Mark Brown, Samuel Ortiz
2011/7/30 Liam Girdwood <lrg@ti.com>:
> On Fri, 2011-07-29 at 18:05 +0200, Axel Lin wrote:
>> hi,
>> Seems this 2 patches are not upstream. Should I resend it again?
>> Regards,
>> Axel
>
> Not required atm thanks, this driver went via mfd so I can apply the fix
> after the mfd merge or rc1.
hi Liam,
aat2870-regulator.c is already merged to your tree but
seems these 2 patches are not (yet) upstream.
Regards,
Axel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-08-10 15:19 ` Axel Lin
@ 2011-08-10 21:31 ` Liam Girdwood
2011-08-10 23:10 ` Axel Lin
0 siblings, 1 reply; 9+ messages in thread
From: Liam Girdwood @ 2011-08-10 21:31 UTC (permalink / raw)
To: axel.lin; +Cc: linux-kernel, Jin Park, Mark Brown, Samuel Ortiz
On 10/08/11 16:19, Axel Lin wrote:
> 2011/7/30 Liam Girdwood <lrg@ti.com>:
>> On Fri, 2011-07-29 at 18:05 +0200, Axel Lin wrote:
>>> hi,
>>> Seems this 2 patches are not upstream. Should I resend it again?
>>> Regards,
>>> Axel
>>
>> Not required atm thanks, this driver went via mfd so I can apply the fix
>> after the mfd merge or rc1.
> hi Liam,
> aat2870-regulator.c is already merged to your tree but
> seems these 2 patches are not (yet) upstream.
>
Could you check regulator git #for-linus. I applied a bunch of patches a few days ago and some for this device. I'll do a pull request for rc2 in a few days.
Thanks
Liam
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-08-31 13:26 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-29 14:48 [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
2011-08-29 14:50 ` [PATCH 2/2 RESEND] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
2011-08-31 13:26 ` [PATCH 1/2 RESEND] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Liam Girdwood
-- strict thread matches above, loose matches on Subject: below --
2011-07-06 23:38 Axel Lin
2011-07-29 16:05 ` Axel Lin
2011-07-29 16:10 ` Liam Girdwood
2011-08-10 15:19 ` Axel Lin
2011-08-10 21:31 ` Liam Girdwood
2011-08-10 23:10 ` Axel Lin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.