drm/i915: quirk away phantom LVDS on Intel's D525MW mainboard

[karo-tx-linux.git] / drivers / usb / host / ehci-atmel.c

diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 02f4611faa62c571a3a59ff4b33a35ead1966caf..3b645ff46f7b9f8df67d2d793c1758be26173b21 100644 (file)
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -37,15 +37,15 @@ static int clocked;
 
 static void atmel_start_clock(void)
 {
-       clk_enable(iclk);
-       clk_enable(fclk);
+       clk_prepare_enable(iclk);
+       clk_prepare_enable(fclk);
        clocked = 1;
 }
 
 static void atmel_stop_clock(void)
 {
-       clk_disable(fclk);
-       clk_disable(iclk);
+       clk_disable_unprepare(fclk);
+       clk_disable_unprepare(iclk);
        clocked = 0;
 }