From 2c93c942ee70fe1ae844dd745ad9855d28a3e5c3 Mon Sep 17 00:00:00 2001 From: Pritesh Raithatha Date: Tue, 22 May 2012 14:20:04 +0530 Subject: [PATCH] --- yaml --- r: 320494 b: refs/heads/master c: ecb7a8ebdc4b063715d5a37919f9118c3f1031a8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/power/gpio-charger.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 62541351ec1c..59ecb1e8805c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9903e62700a122a366ad4c9be8f8f97115cf9a68 +refs/heads/master: ecb7a8ebdc4b063715d5a37919f9118c3f1031a8 diff --git a/trunk/drivers/power/gpio-charger.c b/trunk/drivers/power/gpio-charger.c index 8672c9177dd7..cb2aa3195687 100644 --- a/trunk/drivers/power/gpio-charger.c +++ b/trunk/drivers/power/gpio-charger.c @@ -54,7 +54,7 @@ static int gpio_charger_get_property(struct power_supply *psy, switch (psp) { case POWER_SUPPLY_PROP_ONLINE: - val->intval = gpio_get_value(pdata->gpio); + val->intval = gpio_get_value_cansleep(pdata->gpio); val->intval ^= pdata->gpio_active_low; break; default: