summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-20 19:22:15 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-20 19:22:15 +0400
commit19f0f0af097ba3138ae2780b471180512763a78f (patch)
tree239c0dd5b728cd9c52cbf01777083382b20d95de /drivers/power
parent620d0be88188cd3dc79db3f5eab1420d6f97c70c (diff)
parent2d31757c87a741823f77daaa07eeb8d56be63943 (diff)
downloadlinux-19f0f0af097ba3138ae2780b471180512763a78f.tar.xz
Merge git://git.infradead.org/users/cbou/battery-2.6.35
* git://git.infradead.org/users/cbou/battery-2.6.35: ds2782_battery: Fix ds2782_get_capacity return value
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/ds2782_battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index d762a0cbc6af..2afbeec8b791 100644
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@ -163,7 +163,7 @@ static int ds2782_get_capacity(struct ds278x_info *info, int *capacity)
if (err)
return err;
*capacity = raw;
- return raw;
+ return 0;
}
static int ds2786_get_current(struct ds278x_info *info, int *current_uA)