diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 13:58:54 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-11 13:58:54 -0300 |
commit | ce486a4e35fc5f89c56f1bc8db8ad09cb9e3a98e (patch) | |
tree | bf90690073c0667a01166bbefd5dc1ae0398fe44 /linux/drivers/media/video/saa7134/saa7134-video.c | |
parent | db44a7d2b169cceeafa7a8b5fc5b8fe921d4088d (diff) | |
parent | 6971a9d650f6ab06dfedc4464665366c87da4bbc (diff) | |
download | mediapointer-dvb-s2-ce486a4e35fc5f89c56f1bc8db8ad09cb9e3a98e.tar.gz mediapointer-dvb-s2-ce486a4e35fc5f89c56f1bc8db8ad09cb9e3a98e.tar.bz2 |
merge: http://kernellabs.com/hg/~mkrufky/sms1xxx
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-video.c')
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-video.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c index 5be072c57..04d7e8d66 100644 --- a/linux/drivers/media/video/saa7134/saa7134-video.c +++ b/linux/drivers/media/video/saa7134/saa7134-video.c @@ -1444,7 +1444,6 @@ video_poll(struct file *file, struct poll_table_struct *wait) fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf); fh->cap.read_off = 0; } - mutex_unlock(&fh->cap.vb_lock); buf = fh->cap.read_buf; } |