From 2b3f27e5f8f719a7998436038aae54c83e86c00a Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Fri, 31 Aug 2012 09:25:55 +0000 Subject: [PATCH] --- yaml --- r: 330513 b: refs/heads/master c: b59c93c0090d14556d988607e5bdb297d6e380a7 h: refs/heads/master i: 330511: b9b0ef4e0cd29df890fd40c89b43dcf18b6ae3e1 v: v3 --- [refs] | 2 +- trunk/drivers/power/lp8727_charger.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e43b6e742464..f934583fb88d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91a696330ce4137eef7ad5712c9269a52dc261d4 +refs/heads/master: b59c93c0090d14556d988607e5bdb297d6e380a7 diff --git a/trunk/drivers/power/lp8727_charger.c b/trunk/drivers/power/lp8727_charger.c index 880bb7b98233..2507b2bb9df2 100644 --- a/trunk/drivers/power/lp8727_charger.c +++ b/trunk/drivers/power/lp8727_charger.c @@ -305,9 +305,10 @@ static int lp8727_charger_get_property(struct power_supply *psy, { struct lp8727_chg *pchg = dev_get_drvdata(psy->dev->parent); - if (psp == POWER_SUPPLY_PROP_ONLINE) - val->intval = lp8727_is_charger_attached(psy->name, - pchg->devid); + if (psp != POWER_SUPPLY_PROP_ONLINE) + return -EINVAL; + + val->intval = lp8727_is_charger_attached(psy->name, pchg->devid); return 0; }