* [PATCH RESEND 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
@ 2011-11-28 6:06 Axel Lin
2011-11-28 6:07 ` [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
2011-11-28 11:48 ` [PATCH RESEND 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Mark Brown
0 siblings, 2 replies; 5+ messages in thread
From: Axel Lin @ 2011-11-28 6:06 UTC (permalink / raw)
To: linux-kernel; +Cc: Jin Park, Liam Girdwood, Mark Brown
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>
---
It was sent on https://lkml.org/lkml/2011/7/5/559
and resent on https://lkml.org/lkml/2011/8/31/122.
Seems this patch is lost so I resend it again.
Axel
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 07e98ec..43b25cc 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -160,7 +160,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.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation
2011-11-28 6:06 [PATCH RESEND 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
@ 2011-11-28 6:07 ` Axel Lin
2011-11-28 11:49 ` Mark Brown
2011-11-28 11:48 ` [PATCH RESEND 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Mark Brown
1 sibling, 1 reply; 5+ messages in thread
From: Axel Lin @ 2011-11-28 6:07 UTC (permalink / raw)
To: linux-kernel; +Cc: Jin Park, Liam Girdwood, Mark Brown
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>
---
It was sent on https://lkml.org/lkml/2011/7/5/560
and resent on https://lkml.org/lkml/2011/8/29/210.
Seems the patch is lost so I resend it again.
Axel
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 43b25cc..685ad43 100644
--- a/drivers/regulator/aat2870-regulator.c
+++ b/drivers/regulator/aat2870-regulator.c
@@ -63,7 +63,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.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH RESEND 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
2011-11-28 6:06 [PATCH RESEND 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
2011-11-28 6:07 ` [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
@ 2011-11-28 11:48 ` Mark Brown
1 sibling, 0 replies; 5+ messages in thread
From: Mark Brown @ 2011-11-28 11:48 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Jin Park, Liam Girdwood
On Mon, Nov 28, 2011 at 02:06:31PM +0800, 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.
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator
@ 2011-07-06 3:34 Axel Lin
2011-07-06 3:36 ` [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
0 siblings, 1 reply; 5+ messages in thread
From: Axel Lin @ 2011-07-06 3:34 UTC (permalink / raw)
To: linux-kernel; +Cc: Jin Park, Liam Girdwood, Mark Brown
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>
---
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] 5+ messages in thread
* [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation
2011-07-06 3:34 [PATCH " Axel Lin
@ 2011-07-06 3:36 ` Axel Lin
0 siblings, 0 replies; 5+ messages in thread
From: Axel Lin @ 2011-07-06 3:36 UTC (permalink / raw)
To: linux-kernel; +Cc: Jin Park, Liam Girdwood, Mark Brown
The implementation in aat2870_update() already did the bitwise and operation
against mask parameter.
Signed-off-by: Axel Lin <axel.lin@gmail.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] 5+ messages in thread
end of thread, other threads:[~2011-11-28 11:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-28 6:06 [PATCH RESEND 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Axel Lin
2011-11-28 6:07 ` [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation Axel Lin
2011-11-28 11:49 ` Mark Brown
2011-11-28 11:48 ` [PATCH RESEND 1/2] regulator: aat2870: Fix the logic of checking if no id is matched in aat2870_get_regulator Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2011-07-06 3:34 [PATCH " Axel Lin
2011-07-06 3:36 ` [PATCH 2/2] regulator: aat2870: Remove a redundant bitwise and operation 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.