---

yaml --- r: 306250 b: refs/heads/master c: ca7f4a3 h: refs/heads/master v: v3
git-mirror · May 8, 2012 · 18021c4 · 18021c4
1 parent a04883e
commit 18021c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b43883d659aa3f3aced5e400538b200341e910e0
+refs/heads/master: ca7f4a3821aae53ab4ba5f7b14db9755b856d615
diff --git a/trunk/drivers/media/video/omap3isp/ispcsiphy.c b/trunk/drivers/media/video/omap3isp/ispcsiphy.c
@@ -186,7 +186,9 @@ int omap3isp_csiphy_acquire(struct isp_csiphy *phy)
 	if (rval < 0)
 		goto done;
 
-	omap3isp_csi2_reset(phy->csi2);
+	rval = omap3isp_csi2_reset(phy->csi2);
+	if (rval < 0)
+		goto done;
 
 	csiphy_dphy_config(phy);
 	csiphy_lanes_config(phy);