---

yaml --- r: 274921 b: refs/heads/master c: 4aa1062 h: refs/heads/master i: 274919: efd7429 v: v3
git-mirror · Sep 11, 2011 · 14b45fc · 14b45fc
1 parent 80ed301
commit 14b45fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92394b5c2be774425f255b5c7afbd8b19978fe12
+refs/heads/master: 4aa10626adbc27dcf2e3462bb82b4963c5545669
diff --git a/trunk/drivers/mtd/nand/s3c2410.c b/trunk/drivers/mtd/nand/s3c2410.c
@@ -723,7 +723,7 @@ static int s3c24xx_nand_remove(struct platform_device *pdev)
 
 	/* free the common resources */
 
-	if (info->clk != NULL && !IS_ERR(info->clk)) {
+	if (!IS_ERR(info->clk)) {
 		s3c2410_nand_clk_set_state(info, CLOCK_DISABLE);
 		clk_put(info->clk);
 	}