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
This commit is contained in:
Linus Torvalds 2009-02-11 16:28:08 -08:00
commit b578f3fcca

View file

@ -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) {