system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-21 11:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[media] stk-webcam: fix read() handling when reqbufs was already called

Browse source 
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Tested-by: Arvydas Sidorenko <asido4@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2013-02-06 04:23:01 -03:00 committed by Mauro Carvalho Chehab
parent f80daa2d7d
commit 1b499fe506
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/media/usb/stkwebcam/stk-webcam.c
View file

@ -654,7 +654,7 @@ static ssize_t stk_read(struct file *fp, char __user *buf,
if (!is_present(dev))
return -EIO;
if (dev->owner && dev->owner != fp)
if (dev->owner && (!dev->reading || dev->owner != fp))
return -EBUSY;
dev->owner = fp;
if (!is_streaming(dev)) {
@ -662,6 +662,7 @@ static ssize_t stk_read(struct file *fp, char __user *buf,
|| stk_allocate_buffers(dev, 3)
|| stk_start_stream(dev))
return -ENOMEM;
dev->reading = 1;
spin_lock_irqsave(&dev->spinlock, flags);
for (i = 0; i < dev->n_sbufs; i++) {
list_add_tail(&dev->sio_bufs[i].list, &dev->sio_avail);

1
drivers/media/usb/stkwebcam/stk-webcam.h
View file

@ -118,6 +118,7 @@ struct stk_camera {
int frame_size;
/* Streaming buffers */
int reading;
unsigned int n_sbufs;
struct stk_sio_buffer *sio_bufs;
struct list_head sio_avail;