diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 12:01:29 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 12:01:29 -0200 |
| commit | f902a281e447bad49c3fc1c855035a337bbcefab (patch) | |
| tree | 35778b00a4f7b82bf40dcfc4f027bbd0308ff000 /linux/drivers/media/common | |
| parent | 88f332f73bffc942ecd8aee59abd34df3fd69d6b (diff) | |
| parent | c7c16254d06970012c0473a2ca358e7725c35d91 (diff) | |
| download | mediapointer-dvb-s2-f902a281e447bad49c3fc1c855035a337bbcefab.tar.gz mediapointer-dvb-s2-f902a281e447bad49c3fc1c855035a337bbcefab.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner-simple
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_vbi.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c index 57e441ed3..50cb69e9d 100644 --- a/linux/drivers/media/common/saa7146_vbi.c +++ b/linux/drivers/media/common/saa7146_vbi.c @@ -414,7 +414,6 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) V4L2_FIELD_SEQ_TB, // FIXME: does this really work? sizeof(struct saa7146_buf), file); - mutex_init(&fh->vbi_q.lock); init_timer(&fh->vbi_read_timeout); fh->vbi_read_timeout.function = vbi_read_timeout; diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 915bd9089..027d62c04 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1418,8 +1418,6 @@ static int video_open(struct saa7146_dev *dev, struct file *file) sizeof(struct saa7146_buf), file); - mutex_init(&fh->video_q.lock); - return 0; } |