From daf9935b60a394af57d82fa804eaded33a634e20 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 31 Dec 2010 17:17:51 -0300 Subject: [PATCH] --- yaml --- r: 232177 b: refs/heads/master c: 0d0ae15dde7d4a778056268e64bb2625f84deab6 h: refs/heads/master i: 232175: ed652816f9ff07a44178623b10b6a1d8a0842c79 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/gspca.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c9da63c0e7dd..6fb88b69d42c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce5610bca74571674c1970d33063e7c06295a9a4 +refs/heads/master: 0d0ae15dde7d4a778056268e64bb2625f84deab6 diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c index 4ab906be8962..3581dea3c1f7 100644 --- a/trunk/drivers/media/video/gspca/gspca.c +++ b/trunk/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);