summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2015-12-15 11:52:25 -0700
committerOtavio Salvador <otavio@ossystems.com.br>2016-10-05 17:03:25 -0300
commitbf2698ae5cba6599314af9f2f3ddfc6820d54430 (patch)
tree344afff1cf9af357d26ee6e23aa14997602f8835 /net
parent0413e286b721e90a434f388194e899f8c4d1d349 (diff)
rfkill-gpio: fix clk on/off
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'net')
-rw-r--r--net/rfkill/rfkill-gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c
index 37cae63f0385..71590d455e8d 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -48,7 +48,7 @@ static int rfkill_gpio_set_power(void *data, bool blocked)
struct rfkill_gpio_data *rfkill = data;
if (!blocked && !IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
- clk_enable(rfkill->clk);
+ clk_prepare_enable(rfkill->clk);
if (blocked) {
gpiod_set_value_cansleep(rfkill->shutdown_gpio, 1);
@@ -59,7 +59,7 @@ static int rfkill_gpio_set_power(void *data, bool blocked)
}
if (blocked && !IS_ERR(rfkill->clk) && rfkill->clk_enabled)
- clk_disable(rfkill->clk);
+ clk_disable_unprepare(rfkill->clk);
rfkill->clk_enabled = !blocked;