From 02bfa8d4fc9582122e0207dcbe63658e1e50de45 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Thu, 6 Sep 2012 12:24:00 -0300 Subject: [PATCH] --- yaml --- r: 333819 b: refs/heads/master c: ab99cb18ae5cbb93f650ba7bc305aae6155da880 h: refs/heads/master i: 333817: 7ef68ca1889a6040ebc4c108df4b553f02c0b9f5 333815: 51b15645520493e0637ca2879bdca219564daf60 v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/soc_camera/soc_camera.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cf14599ed98b..e9e4a8780e67 100644 --- 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 index 96c3c6e83cc0..d3f0b84e2d70 100644 --- 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 */