---

yaml --- r: 331009 b: refs/heads/master c: 9f9831a h: refs/heads/master i: 331007: 52eba67 v: v3
git-mirror · Sep 15, 2012 · bab2247 · bab2247
1 parent fd2ddaf
commit bab2247
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3920631c4b8af70893fe70df53e94adb0cd66f71
+refs/heads/master: 9f9831a8b61fb3cae76bc31561bafdb0a58ad12b
diff --git a/trunk/drivers/media/platform/mx2_emmaprp.c b/trunk/drivers/media/platform/mx2_emmaprp.c
@@ -906,9 +906,8 @@ static int emmaprp_probe(struct platform_device *pdev)
 	}
 
 	pcdev->clk_emma_ahb = devm_clk_get(&pdev->dev, "ahb");
-	if (IS_ERR(pcdev->clk_emma_ipg)) {
+	if (IS_ERR(pcdev->clk_emma_ahb))
 		return PTR_ERR(pcdev->clk_emma_ahb);
-	}
 
 	irq_emma = platform_get_irq(pdev, 0);
 	res_emma = platform_get_resource(pdev, IORESOURCE_MEM, 0);