From 16e5f67e21a74288a33d74ea1f71f9af556e9cf0 Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Mon, 27 Aug 2012 10:37:17 +0530 Subject: [PATCH] --- yaml --- r: 328645 b: refs/heads/master c: 3f09e6c0d32398b777b00c21053a1ef5f840b1af h: refs/heads/master i: 328643: e3576431ee1450495c01dc2eee3ff0cf0785dcc1 v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_arasan_cf.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9940c28943bb..f6df4cc9a29f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8996b89d6bc98ae2f6d6e6e624a42a3f89d06949 +refs/heads/master: 3f09e6c0d32398b777b00c21053a1ef5f840b1af diff --git a/trunk/drivers/ata/pata_arasan_cf.c b/trunk/drivers/ata/pata_arasan_cf.c index bfaa5cb1629a..d82c6dc0c20c 100644 --- a/trunk/drivers/ata/pata_arasan_cf.c +++ b/trunk/drivers/ata/pata_arasan_cf.c @@ -310,7 +310,7 @@ static int cf_init(struct arasan_cf_dev *acdev) unsigned long flags; int ret = 0; - ret = clk_enable(acdev->clk); + ret = clk_prepare_enable(acdev->clk); if (ret) { dev_dbg(acdev->host->dev, "clock enable failed"); return ret; @@ -340,7 +340,7 @@ static void cf_exit(struct arasan_cf_dev *acdev) writel(readl(acdev->vbase + OP_MODE) & ~CFHOST_ENB, acdev->vbase + OP_MODE); spin_unlock_irqrestore(&acdev->host->lock, flags); - clk_disable(acdev->clk); + clk_disable_unprepare(acdev->clk); } static void dma_callback(void *dev)