From: Jean-François Moine Date: Fri, 9 Apr 2010 09:07:58 +0000 (-0300) Subject: V4L/DVB: gspca - main: Restart streaming after reqbuf X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=832d0a9130c18b9ee4b671c46763b972eb2a2568;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git V4L/DVB: gspca - main: Restart streaming after reqbuf Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 4fb031cfb64..9c9d7ea7e62 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -1503,7 +1503,7 @@ static int vidioc_reqbufs(struct file *file, void *priv, struct v4l2_requestbuffers *rb) { struct gspca_dev *gspca_dev = priv; - int i, ret = 0; + int i, ret = 0, streaming; switch (rb->memory) { case GSPCA_MEMORY_READ: /* (internal call) */ @@ -1538,7 +1538,8 @@ static int vidioc_reqbufs(struct file *file, void *priv, } /* stop streaming */ - if (gspca_dev->streaming) { + streaming = gspca_dev->streaming; + if (streaming) { mutex_lock(&gspca_dev->usb_lock); gspca_dev->usb_err = 0; gspca_stream_off(gspca_dev); @@ -1557,6 +1558,8 @@ static int vidioc_reqbufs(struct file *file, void *priv, if (ret == 0) { rb->count = gspca_dev->nframes; gspca_dev->capt_file = file; + if (streaming) + ret = gspca_init_transfer(gspca_dev); } out: mutex_unlock(&gspca_dev->queue_lock);