From 0824567787b34fbda3e5018670ee6991cad726ab Mon Sep 17 00:00:00 2001 From: Deepak Sikri Date: Mon, 17 Dec 2012 16:02:32 -0800 Subject: [PATCH] --- yaml --- r: 346437 b: refs/heads/master c: 93d78394ac5ec72315e7f9a7193c6649d817a9eb h: refs/heads/master i: 346435: 707524d4bbb3ac120c886b535812efb7392c365a v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-spear.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index de3cc48bef8d..70b4417e43ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdaa2c63b060ae082ab4f20378c1a6307b59b8db +refs/heads/master: 93d78394ac5ec72315e7f9a7193c6649d817a9eb diff --git a/trunk/drivers/rtc/rtc-spear.c b/trunk/drivers/rtc/rtc-spear.c index 311a5274b528..c96f56cfc1d8 100644 --- a/trunk/drivers/rtc/rtc-spear.c +++ b/trunk/drivers/rtc/rtc-spear.c @@ -395,7 +395,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev) if (IS_ERR(config->clk)) return PTR_ERR(config->clk); - status = clk_enable(config->clk); + status = clk_prepare_enable(config->clk); if (status < 0) return status; @@ -418,7 +418,7 @@ static int __devinit spear_rtc_probe(struct platform_device *pdev) err_disable_clock: platform_set_drvdata(pdev, NULL); - clk_disable(config->clk); + clk_disable_unprepare(config->clk); return status; } @@ -429,7 +429,7 @@ static int __devexit spear_rtc_remove(struct platform_device *pdev) rtc_device_unregister(config->rtc); spear_rtc_disable_interrupt(config); - clk_disable(config->clk); + clk_disable_unprepare(config->clk); device_init_wakeup(&pdev->dev, 0); return 0;