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

Signed-off-by: Hans Verkuil <[email protected]>
Tested-by: Arvydas Sidorenko <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index 2f1a09db11353c5d5d0e83393c957467f870b9d8..a8fdbaf3472012ba2f2efe2da058aaafb50f3ad0 100644 (file)
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -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);

diff --git a/drivers/media/usb/stkwebcam/stk-webcam.h b/drivers/media/usb/stkwebcam/stk-webcam.h
index 03550cf60dcdbf381997ddd3de7682f956cd137b..9bbfa3d9bfdda3a41a26ed05427f05aae3ba68c1 100644 (file)
--- a/drivers/media/usb/stkwebcam/stk-webcam.h
+++ b/drivers/media/usb/stkwebcam/stk-webcam.h
@@ -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;