---

yaml --- r: 195857 b: refs/heads/master c: b840bc1 h: refs/heads/master i: 195855: a9a08c5 v: v3
git-mirror · Feb 25, 2010 · be31292 · be31292
1 parent c0ea09b
commit be31292
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17fabf156507ec0f688f1e58be02f38e04de0c6e
+refs/heads/master: b840bc11b5062803c204d8a9625a1a1c5812d6d6
diff --git a/trunk/drivers/mtd/nand/mxc_nand.c b/trunk/drivers/mtd/nand/mxc_nand.c
@@ -886,11 +886,10 @@ static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)
 	int ret = 0;
 
 	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
-	if (mtd) {
-		ret = mtd->suspend(mtd);
-		/* Disable the NFC clock */
-		clk_disable(host->clk);
-	}
+
+	ret = mtd->suspend(mtd);
+	/* Disable the NFC clock */
+	clk_disable(host->clk);
 
 	return ret;
 }
@@ -904,11 +903,9 @@ static int mxcnd_resume(struct platform_device *pdev)
 
 	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
 
-	if (mtd) {
-		/* Enable the NFC clock */
-		clk_enable(host->clk);
-		mtd->resume(mtd);
-	}
+	/* Enable the NFC clock */
+	clk_enable(host->clk);
+	mtd->resume(mtd);
 
 	return ret;
 }