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

torvalds · torvalds · commit 19f0f0af097b · 2010-07-20T08:22:15.000-07:00
* git://git.infradead.org/users/cbou/battery-2.6.35:
  ds2782_battery: Fix ds2782_get_capacity return value
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)

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ static int ds2782_get_capacity(struct ds278x_info info, int capacity)`
`163`	`163`	`if (err)`
`164`	`164`	`return err;`
`165`	`165`	`*capacity = raw;`
`166`		`- return raw;`
	`166`	`+ return 0;`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`static int ds2786_get_current(struct ds278x_info info, int current_uA)`