Commit b578f3fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.infradead.org/users/cbou/battery-2.6.29:
  pcf50633_charger: Fix typo
parents 507e2fba ccc9c8b9

drivers/power/pcf50633-charger.c

+2 −1
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ static int adapter_get_property(struct power_supply *psy, 
			enum power_supply_property psp,

			union power_supply_propval *val)

{

	struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, usb);

	struct pcf50633_mbc *mbc = container_of(psy,

				struct pcf50633_mbc, adapter);

	int ret = 0;



	switch (psp) {