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
mariux64 · Feb 12, 2009 · b578f3f · b578f3f
2 parents 507e2fb + ccc9c8b
commit b578f3f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
@@ -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) {