diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 11:40:04 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 11:40:04 -0200 |
| commit | 7fdad17aa5f5e0f8d164613e27d828962100b4c9 (patch) | |
| tree | 1a55910758244516a37cf113ec0ab7e6427d613b | |
| parent | ff34055d31f6ecce43c9d4d3747b496b8a039b02 (diff) | |
| download | mediapointer-dvb-s2-7fdad17aa5f5e0f8d164613e27d828962100b4c9.tar.gz mediapointer-dvb-s2-7fdad17aa5f5e0f8d164613e27d828962100b4c9.tar.bz2 | |
videobuf lock is already initialized at videobuf-core.c
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Removes the duplicated mutex_init code.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -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; } |