From 4b6f6322ae21207eac0fb1d6fd3d4a5d2053c519 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Mon, 31 Jan 2011 09:19:32 -0300 Subject: [PATCH] --- yaml --- r: 241899 b: refs/heads/master c: 7fdbd85bce033e2d0f74e5d326ab43906653cb81 h: refs/heads/master i: 241897: 6bcfff5db67685b476255895bbca86937760ee6c 241895: edf061167c56e83679900e454f46a0f8cfa0f664 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/soc_camera.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c5a1d129bb5a..bc8a9939df99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed5b65dc362d488958075381d97931d865e77259 +refs/heads/master: 7fdbd85bce033e2d0f74e5d326ab43906653cb81 diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c index a7820a549f1b..67611ad6af96 100644 --- a/trunk/drivers/media/video/soc_camera.c +++ b/trunk/drivers/media/video/soc_camera.c @@ -655,10 +655,10 @@ static int soc_camera_streamon(struct file *file, void *priv, if (icd->streamer != file) return -EBUSY; - v4l2_subdev_call(sd, video, s_stream, 1); - /* This calls buf_queue from host driver's videobuf_queue_ops */ ret = videobuf_streamon(&icd->vb_vidq); + if (!ret) + v4l2_subdev_call(sd, video, s_stream, 1); return ret; }