diff options
| author | Hans de Goede | 2010-12-31 21:17:51 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-01-19 14:45:00 +0100 |
| commit | 0d0ae15dde7d4a778056268e64bb2625f84deab6 (patch) | |
| tree | 1ed3ac1b82eab0ec82da2ee3e54f11d6dadf40bc /drivers/media | |
| parent | [media] gspca_main: Allow switching from read to mmap / userptr mode (diff) | |
| download | kernel-qcow2-linux-0d0ae15dde7d4a778056268e64bb2625f84deab6.tar.gz kernel-qcow2-linux-0d0ae15dde7d4a778056268e64bb2625f84deab6.tar.xz kernel-qcow2-linux-0d0ae15dde7d4a778056268e64bb2625f84deab6.zip | |
[media] gspca_main: wake wq on streamoff
We check for not streaming as a condition to abort waiting in dqbuf, so
when another thread does a streamoff we should wake the wq.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/gspca/gspca.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 4ab906be8962..3581dea3c1f7 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -1634,6 +1634,8 @@ static int vidioc_streamoff(struct file *file, void *priv, gspca_dev->usb_err = 0; gspca_stream_off(gspca_dev); mutex_unlock(&gspca_dev->usb_lock); + /* In case another thread is waiting in dqbuf */ + wake_up_interruptible(&gspca_dev->wq); /* empty the transfer queues */ atomic_set(&gspca_dev->fr_q, 0); |