From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Sat, 31 Aug 2013 00:47:57 +0000 (-0700)
Subject: rx51_battery: Fix channel number when reading adc value
X-Git-Tag: v3.12-rc1~58^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=db15e6312efd537e2deb2cbad110c23f98704a3c;p=linux.git

rx51_battery: Fix channel number when reading adc value

This issue was introduced in commit 8e2747f031bd "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@open-nandra.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
---

diff --git a/drivers/power/rx51_battery.c b/drivers/power/rx51_battery.c
index 03f57615be56..1bc5857b8bd5 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];
 }
 
 /*