diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2014-05-15 11:22:17 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:00:32 +0900 |
| commit | 2fd956c0c9ec0124e79311718a5406fdb303c5bb (patch) | |
| tree | 83ce3c3af00d1f1634cc6e854242da4b76cc1344 /net | |
| parent | a5813043fb2534edf08a7f6efa78f38bf9e829bd (diff) | |
| download | linux-3.10-2fd956c0c9ec0124e79311718a5406fdb303c5bb.tar.gz linux-3.10-2fd956c0c9ec0124e79311718a5406fdb303c5bb.tar.bz2 linux-3.10-2fd956c0c9ec0124e79311718a5406fdb303c5bb.zip | |
net: rfkill: gpio: use clk_prepare_enable/clk_disable_unprepare
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rfkill/rfkill-gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index 2dd78c628d8..73c08c62f16 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)) |