OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2010-07-20 08:22:15 -07:00
parent 620d0be881 2d31757c87
commit 19f0f0af09
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/power/ds2782_battery.c
View File

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