Re: [PATCH] power: rx51_battery: Replace hardcoded channels values.

[Belisko Marek]

Hi Anton,

On Wed, Aug 28, 2013 at 3:27 AM, Anton Vorontsov <anton@xxxxxxxxxx> wrote:
> On Thu, Aug 22, 2013 at 12:45:10AM +0200, Marek Belisko wrote:
>> In twl4030_madc header exist defines for fixed channels
>> + add rx51 specific channels and replace all hardcoded channels
>> values.
>>
>> Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
>
> Applied, thanks!
Thanks for that. Unfortunately yesterday I was working on similar code
and found issue (wrong channel index) which was introduced by this
commit.
Fix is below. Sorry for troubles.

From: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
Date: Wed, 28 Aug 2013 08:04:10 +0200
Subject: [PATCH] power: rx51_battery: Fix channel number when reading adc
 value.

This issue was introduced in commit:
power: rx51_battery: Replace hardcoded channels values.

Original code use channel as argument which was shifted by one in function.
After mentioned commit argument is already shifted so we need to get index
back.

Signed-off-by: Marek Belisko <marek.belisko@xxxxxxxxxxxxxxx>
---
 drivers/power/rx51_battery.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/power/rx51_battery.c b/drivers/power/rx51_battery.c
index 03f5761..1bc5857 100644
--- a/drivers/power/rx51_battery.c
+++ b/drivers/power/rx51_battery.c
@@ -51,7 +51,7 @@ static int rx51_battery_read_adc(int channel)
  if (twl4030_madc_conversion(&req) <= 0)
  return -ENODATA;

- return req.rbuf[channel];
+ return req.rbuf[ffs(channel) - 1];
 }

 /*
-- 
1.7.9.5

>
> Anton

BR,

marek

-- 
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer

Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/