summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2014-05-15 02:22:17 (GMT)
committerBeomho Seo <beomho.seo@samsung.com>2014-05-15 02:25:03 (GMT)
commitee211982e16b617ea261ef3e3139f4663c08d03f (patch)
tree3e6067def1b51305f555c324178d5e4dc5140e6c
parent812b3f8e8645e18b9417177f0dbe858ca15e8630 (diff)
downloadlinux-3.10-ee211982e16b617ea261ef3e3139f4663c08d03f.zip
linux-3.10-ee211982e16b617ea261ef3e3139f4663c08d03f.tar.gz
linux-3.10-ee211982e16b617ea261ef3e3139f4663c08d03f.tar.bz2
net: rfkill: gpio: use clk_prepare_enable/clk_disable_unpreparerefs/changes/71/21071/1
rfkill-gpio calls clk_enable() without first calling clk_prepare(), resulting in a warning and no effect. Switch to clk_prepare_enable() and clk_disable_unprepare. Change-Id: I4cb7ed7ff551daab034deb300f6def1c44721fe3 Signed-off-by: Chen-Yu Tsai <wens@csie.org>
-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 2dd78c6..73c08c6 100644
--- a/net/rfkill/rfkill-gpio.c
+++ b/net/rfkill/rfkill-gpio.c
@@ -51,10 +51,10 @@ static int rfkill_gpio_set_power(void *data, bool blocked)
if (gpio_is_valid(rfkill->reset_gpio))
gpio_set_value(rfkill->reset_gpio, 0);
if (!IS_ERR(rfkill->clk) && rfkill->clk_enabled)
- clk_disable(rfkill->clk);
+ clk_disable_unprepare(rfkill->clk);
} else {
if (!IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
- clk_enable(rfkill->clk);
+ clk_prepare_enable(rfkill->clk);
if (gpio_is_valid(rfkill->reset_gpio))
gpio_set_value(rfkill->reset_gpio, 1);
if (gpio_is_valid(rfkill->shutdown_gpio))