diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 17:40:04 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-18 15:15:11 +0100 |
| commit | ce3a35d3c00918296e552af5ecc7b771af766436 (patch) | |
| tree | 11cea0e1b70fde7fef7b231b2096498c2fad5680 /drivers/media/common | |
| parent | V4L/DVB (7118): dvb-ttpci: Improved display of still pictures (diff) | |
| download | linux-ce3a35d3c00918296e552af5ecc7b771af766436.tar.xz linux-ce3a35d3c00918296e552af5ecc7b771af766436.zip | |
V4L/DVB (7120): videobuf lock is already initialized at videobuf-core.c
Removes the duplicated mutex_init code.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/common')
| -rw-r--r-- | drivers/media/common/saa7146_vbi.c | 1 | ||||
| -rw-r--r-- | drivers/media/common/saa7146_video.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index c32dda973e92..bfbd5a841ebf 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c @@ -413,7 +413,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/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index c31ab480d8e1..66fdbd0e6a6d 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -1417,8 +1417,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; } |