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

From: Anton Vorontsov
Date: Fri Aug 30 2013 - 20:56:28 EST


> 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>

Applied, thanks!

> ---
> 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];
> }
>
> /*
--
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/