The common clock framework expects clocks to be prepared before they are enabled. Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx> --- arch/arm/plat-samsung/samsung-time.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/plat-samsung/samsung-time.c b/arch/arm/plat-samsung/samsung-time.c index f899cbc..6ebb851 100644 --- a/arch/arm/plat-samsung/samsung-time.c +++ b/arch/arm/plat-samsung/samsung-time.c @@ -355,7 +355,7 @@ static void __init samsung_timer_resources(void) if (IS_ERR(timerclk)) panic("failed to get timers clock for timer"); - clk_enable(timerclk); + clk_prepare_enable(timerclk); sprintf(devname, "s3c24xx-pwm.%lu", event_id); s3c_device_timer[event_id].id = event_id; @@ -369,7 +369,7 @@ static void __init samsung_timer_resources(void) if (IS_ERR(tdiv_event)) panic("failed to get pwm-tdiv clock for event timer"); - clk_enable(tin_event); + clk_prepare_enable(tin_event); sprintf(devname, "s3c24xx-pwm.%lu", source_id); s3c_device_timer[source_id].id = source_id; @@ -383,7 +383,7 @@ static void __init samsung_timer_resources(void) if (IS_ERR(tdiv_source)) panic("failed to get pwm-tdiv clock for source timer"); - clk_enable(tin_source); + clk_prepare_enable(tin_source); } void __init samsung_timer_init(void) -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html