---

yaml --- r: 333819 b: refs/heads/master c: ab99cb1 h: refs/heads/master i: 333817: 7ef68ca 333815: 51b1564 v: v3
git-mirror · Oct 6, 2012 · 02bfa8d · 02bfa8d
1 parent b1a4846
commit 02bfa8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58dec65d714f9f2872fdfe8f6a1f36027431de95
+refs/heads/master: ab99cb18ae5cbb93f650ba7bc305aae6155da880
diff --git a/trunk/drivers/media/platform/soc_camera/soc_camera.c b/trunk/drivers/media/platform/soc_camera/soc_camera.c
@@ -1184,7 +1184,8 @@ static int soc_camera_probe(struct soc_camera_device *icd)
 	sd->grp_id = soc_camera_grp_id(icd);
 	v4l2_set_subdev_hostdata(sd, icd);
 
-	if (v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler, NULL))
+	ret = v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler, NULL);
+	if (ret < 0)
 		goto ectrl;
 
 	/* At this point client .probe() should have run already */