summaryrefslogtreecommitdiff
path: root/drivers/media/video/m5mols/m5mols_capture.c
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2011-12-12 22:45:56 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-30 20:38:06 +0400
commit5d4294b8ddf92092ffad61fe552adeeabb4242bd (patch)
tree670015258ae031f53b2422ef963337009a1ef7d1 /drivers/media/video/m5mols/m5mols_capture.c
parentd5048c9a289485f65d108ede183dd3f02f1cd408 (diff)
downloadlinux-5d4294b8ddf92092ffad61fe552adeeabb4242bd.tar.xz
[media] m5mols: Don't ignore v4l2_ctrl_handler_setup() return value
v4l2_ctrl_handler_setup() may fail so check its return value when restoring controls after device is powered on. While at it simplify the m5mols_restore_function() a bit. Acked-by: HeungJun Kim <riverful.kim@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/m5mols/m5mols_capture.c')
-rw-r--r--drivers/media/video/m5mols/m5mols_capture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/m5mols/m5mols_capture.c b/drivers/media/video/m5mols/m5mols_capture.c
index 6814a9d53bf5..ba25e8e2ba4c 100644
--- a/drivers/media/video/m5mols/m5mols_capture.c
+++ b/drivers/media/video/m5mols/m5mols_capture.c
@@ -116,7 +116,7 @@ int m5mols_start_capture(struct m5mols_info *info)
*/
ret = m5mols_mode(info, REG_MONITOR);
if (!ret)
- ret = m5mols_sync_controls(info);
+ ret = m5mols_restore_controls(info);
if (!ret)
ret = m5mols_write(sd, CAPP_YUVOUT_MAIN, REG_JPEG);
if (!ret)