From 82c1fe9d3ac2d54df22507d73ef285efe3de48d4 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 10 Dec 2012 08:55:53 +0000 Subject: [PATCH] --- yaml --- r: 343223 b: refs/heads/master c: 3708903ee60b1b89cbeee00cbc76e9fdbcbbed2e h: refs/heads/master i: 343221: 00aa85fc24a88cf2514f3b46eed81348a3117b3c 343219: b8e4bf5bc8db237f7672840fa06dbdd6160af286 343215: 67cb9d0a19915a6b2fbf2b657984fab69bc0ea98 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/gpio-regulator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 512c895fa887..b5c3a8a192df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad0b8b9e82b63ad2cc5e6822448adc897f49a5c4 +refs/heads/master: 3708903ee60b1b89cbeee00cbc76e9fdbcbbed2e diff --git a/trunk/drivers/regulator/gpio-regulator.c b/trunk/drivers/regulator/gpio-regulator.c index 84e585fca795..9f40b0df68cb 100644 --- a/trunk/drivers/regulator/gpio-regulator.c +++ b/trunk/drivers/regulator/gpio-regulator.c @@ -82,7 +82,7 @@ static int gpio_regulator_set_voltage(struct regulator_dev *dev, for (ptr = 0; ptr < data->nr_gpios; ptr++) { state = (target & (1 << ptr)) >> ptr; - gpio_set_value(data->gpios[ptr].gpio, state); + gpio_set_value_cansleep(data->gpios[ptr].gpio, state); } data->state = target; @@ -119,7 +119,7 @@ static int gpio_regulator_set_current_limit(struct regulator_dev *dev, for (ptr = 0; ptr < data->nr_gpios; ptr++) { state = (target & (1 << ptr)) >> ptr; - gpio_set_value(data->gpios[ptr].gpio, state); + gpio_set_value_cansleep(data->gpios[ptr].gpio, state); } data->state = target;