aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-11 16:28:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-11 16:28:08 -0800
commitb578f3fcca1e78624dfb5f358776e63711d7fda2 (patch)
treec4cb5147207a78d751dd1a558653ea48b57b8444
parent507e2fbaaacb6f164b4125b87c5002f95143174b (diff)
parentccc9c8b91c2631da2cab46a6fcd9c3106dcb9abb (diff)
downloadlinux-stericsson-b578f3fcca1e78624dfb5f358776e63711d7fda2.tar.gz
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
-rw-r--r--drivers/power/pcf50633-charger.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index e988ec130fcd..41aec2acbb91 100644
--- 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) {