xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] s2255drv: fix spinlock issue

Browse Source 
qlock spinlock controls access to buf_list and sequence.
qlock spinlock should not be locked during a copy to video buffers, an
operation that may sleep.

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
sensoray-dev
2014-11-04 17:34:03 -03:00
committed by Mauro Carvalho Chehab
parent 6db47fa1f1
commit 9694fbec95
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/usb/s2255/s2255drv.c
View File

@@ -558,27 +558,30 @@ static void s2255_fwchunk_complete(struct urb *urb)
} }
static int s2255_got_frame(struct s2255_vc *vc, int jpgsize) static void s2255_got_frame(struct s2255_vc *vc, int jpgsize)
{ {
struct s2255_buffer *buf; struct s2255_buffer *buf;
struct s2255_dev *dev = to_s2255_dev(vc->vdev.v4l2_dev); struct s2255_dev *dev = to_s2255_dev(vc->vdev.v4l2_dev);
unsigned long flags = 0; unsigned long flags = 0;
int rc = 0;
spin_lock_irqsave(&vc->qlock, flags); spin_lock_irqsave(&vc->qlock, flags);
if (list_empty(&vc->buf_list)) { if (list_empty(&vc->buf_list)) {
dprintk(dev, 1, "No active queue to serve\n"); dprintk(dev, 1, "No active queue to serve\n");
rc = -1; spin_unlock_irqrestore(&vc->qlock, flags);
goto unlock; return;
} }
buf = list_entry(vc->buf_list.next, buf = list_entry(vc->buf_list.next,
struct s2255_buffer, list); struct s2255_buffer, list);
list_del(&buf->list); list_del(&buf->list);
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
s2255_fillbuff(vc, buf, jpgsize); buf->vb.v4l2_buf.field = vc->field;
dprintk(dev, 2, "%s: [buf] [%p]\n", __func__, buf); buf->vb.v4l2_buf.sequence = vc->frame_count;
unlock:
spin_unlock_irqrestore(&vc->qlock, flags); spin_unlock_irqrestore(&vc->qlock, flags);
return rc;
s2255_fillbuff(vc, buf, jpgsize);
/* tell v4l buffer was filled */
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
dprintk(dev, 2, "%s: [buf] [%p]\n", __func__, buf);
} }
static const struct s2255_fmt *format_by_fourcc(int fourcc) static const struct s2255_fmt *format_by_fourcc(int fourcc)
@@ -649,11 +652,6 @@ static void s2255_fillbuff(struct s2255_vc *vc,
} }
dprintk(dev, 2, "s2255fill at : Buffer 0x%08lx size= %d\n", dprintk(dev, 2, "s2255fill at : Buffer 0x%08lx size= %d\n",
(unsigned long)vbuf, pos); (unsigned long)vbuf, pos);
/* tell v4l buffer was filled */
buf->vb.v4l2_buf.field = vc->field;
buf->vb.v4l2_buf.sequence = vc->frame_count;
v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
} }