From 18021c4882cb22326219bfceb2adaf0c4e7b38cc Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Fri, 2 Mar 2012 13:03:01 -0300
Subject: [PATCH] --- yaml --- r: 306250 b: refs/heads/master c:
 ca7f4a3821aae53ab4ba5f7b14db9755b856d615 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/video/omap3isp/ispcsiphy.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 72a955573b35..f3d7ec7e8d93 100644
--- 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
index 5be37ce7d0c2..348f67ebbbc9 100644
--- 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);