From d0b0bcb2424ca564e11fdad13c238fbee9ef6f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 6 Dec 2012 08:42:27 +0100 Subject: [PATCH] --- yaml --- r: 347221 b: refs/heads/master c: c10d8ee3feaf725007e515b5f2972dffaa793f9a h: refs/heads/master i: 347219: 99e8116ef41c06d744ac0c55c869e3f90e38b060 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/mxc_nand.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0bca5006d985..ec90591814b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5346c27c5fed6b30aff35e1fcb595625097e646c +refs/heads/master: c10d8ee3feaf725007e515b5f2972dffaa793f9a diff --git a/trunk/drivers/mtd/nand/mxc_nand.c b/trunk/drivers/mtd/nand/mxc_nand.c index 4aef6a355d54..ab0fe383c50b 100644 --- a/trunk/drivers/mtd/nand/mxc_nand.c +++ b/trunk/drivers/mtd/nand/mxc_nand.c @@ -1533,7 +1533,8 @@ static int mxcnd_probe(struct platform_device *pdev) return 0; escan: - clk_disable_unprepare(host->clk); + if (host->clk_act) + clk_disable_unprepare(host->clk); return err; }