Commit 19f0f0af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 620d0be8 2d31757c

drivers/power/ds2782_battery.c

+1 −1
Original line number Diff line number Diff line
@@ -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)