[GIT PULL] battery-2.6.35.git

[Anton Vorontsov <cbouatmailru@gmail.com>]

Hello Linus,

Please pull a small fixup for the ds2782_battery driver.

Thanks,


The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02:
  Linus Torvalds (1):
        Linux 2.6.35-rc3

are available in the git repository at:

  git://git.infradead.org/users/cbou/battery-2.6.35.git master

Ryan Mallon (1):
      ds2782_battery: Fix ds2782_get_capacity return value

 drivers/power/ds2782_battery.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 2d31757c87a741823f77daaa07eeb8d56be63943
Author: Ryan Mallon <ryan@bluewatersys.com>
Date:   Tue Jun 15 12:44:59 2010 +1200

    ds2782_battery: Fix ds2782_get_capacity return value
    
    The ds2782_get_capacity function should return 0 on success, not the
    capacity value.
    
    Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
    Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index d762a0c..2afbeec 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)

-- 
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2