---

yaml --- r: 218787 b: refs/heads/master c: c6134c9 h: refs/heads/master i: 218785: d772bba 218783: bfc29b9 v: v3
git-mirror · Oct 7, 2010 · 7d3ebd2 · 7d3ebd2
1 parent 3ce8eb6
commit 7d3ebd2
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: f57b407cfd5fbd70251e9fa0ea7aa083ac06d25c
+refs/heads/master: c6134c967c5b8b5986371de335fa4ec39de268bc
diff --git a/trunk/drivers/dma/ste_dma40.c b/trunk/drivers/dma/ste_dma40.c
@@ -2636,7 +2636,7 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
 	return base;
 
 failure:
-	if (clk) {
+	if (!IS_ERR(clk)) {
 		clk_disable(clk);
 		clk_put(clk);
 	}