diff options
author | Pritesh Raithatha <praithatha@nvidia.com> | 2012-05-22 04:50:04 -0400 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-06-19 23:48:37 -0400 |
commit | ecb7a8ebdc4b063715d5a37919f9118c3f1031a8 (patch) | |
tree | 9aa3d1378c9d08bdf389d74b2638a695bd800ef2 /drivers/power | |
parent | 9903e62700a122a366ad4c9be8f8f97115cf9a68 (diff) |
gpio-charger: Use cansleep version of gpio_set_value
Context of gpio_charger_get_property is sleepable so we should
use gpio_set_value_cansleep instead of gpio_set_value.
It will remove WARN_ON incase of using gpio from i2c-to-gpio
expander like pca953x.
Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/gpio-charger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c index 8672c9177dd7..cb2aa3195687 100644 --- a/drivers/power/gpio-charger.c +++ b/drivers/power/gpio-charger.c | |||
@@ -54,7 +54,7 @@ static int gpio_charger_get_property(struct power_supply *psy, | |||
54 | 54 | ||
55 | switch (psp) { | 55 | switch (psp) { |
56 | case POWER_SUPPLY_PROP_ONLINE: | 56 | case POWER_SUPPLY_PROP_ONLINE: |
57 | val->intval = gpio_get_value(pdata->gpio); | 57 | val->intval = gpio_get_value_cansleep(pdata->gpio); |
58 | val->intval ^= pdata->gpio_active_low; | 58 | val->intval ^= pdata->gpio_active_low; |
59 | break; | 59 | break; |
60 | default: | 60 | default: |