Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cfafb62fb4d21648eb706f3028811b611c60d15e

Authored by Boris BREZILLON
Committed by Greg Kroah-Hartman
1 parent 8e82d8d98a
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ehci-atmel.c: prepare clk before calling enable 

Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
avoid common clk framework warnings.

Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

drivers/usb/host/ehci-atmel.c
Diff comments   View file @ cfafb62
... ... @@ -37,15 +37,15 @@
37 37  
38 38 static void atmel_start_clock(void)
39 39 {
40   - clk_enable(iclk);
41   - clk_enable(fclk);
  40 + clk_prepare_enable(iclk);
  41 + clk_prepare_enable(fclk);
42 42 clocked = 1;
43 43 }
44 44  
45 45 static void atmel_stop_clock(void)
46 46 {
47   - clk_disable(fclk);
48   - clk_disable(iclk);
  47 + clk_disable_unprepare(fclk);
  48 + clk_disable_unprepare(iclk);
49 49 clocked = 0;
50 50 }
51 51