diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-20 11:22:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-20 11:22:15 -0400 |
| commit | 19f0f0af097ba3138ae2780b471180512763a78f (patch) | |
| tree | 239c0dd5b728cd9c52cbf01777083382b20d95de | |
| parent | 620d0be88188cd3dc79db3f5eab1420d6f97c70c (diff) | |
| parent | 2d31757c87a741823f77daaa07eeb8d56be63943 (diff) | |
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
| -rw-r--r-- | drivers/power/ds2782_battery.c | 2 |
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) | |||
| 163 | if (err) | 163 | if (err) |
| 164 | return err; | 164 | return err; |
| 165 | *capacity = raw; | 165 | *capacity = raw; |
| 166 | return raw; | 166 | return 0; |
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | static int ds2786_get_current(struct ds278x_info *info, int *current_uA) | 169 | static int ds2786_get_current(struct ds278x_info *info, int *current_uA) |