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
git-mirror · Jul 20, 2010 · 19f0f0a · 19f0f0a
2 parents 620d0be + 2d31757
commit 19f0f0a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)