diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 11:40:04 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-18 09:15:11 -0500 |
commit | ce3a35d3c00918296e552af5ecc7b771af766436 (patch) | |
tree | 11cea0e1b70fde7fef7b231b2096498c2fad5680 | |
parent | 0ed4a6ea9dbd9f5b77ce594f7f46be022d2c49ec (diff) |
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>
-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) | |||
413 | V4L2_FIELD_SEQ_TB, // FIXME: does this really work? | 413 | V4L2_FIELD_SEQ_TB, // FIXME: does this really work? |
414 | sizeof(struct saa7146_buf), | 414 | sizeof(struct saa7146_buf), |
415 | file); | 415 | file); |
416 | mutex_init(&fh->vbi_q.lock); | ||
417 | 416 | ||
418 | init_timer(&fh->vbi_read_timeout); | 417 | init_timer(&fh->vbi_read_timeout); |
419 | fh->vbi_read_timeout.function = vbi_read_timeout; | 418 | 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) | |||
1417 | sizeof(struct saa7146_buf), | 1417 | sizeof(struct saa7146_buf), |
1418 | file); | 1418 | file); |
1419 | 1419 | ||
1420 | mutex_init(&fh->video_q.lock); | ||
1421 | |||
1422 | return 0; | 1420 | return 0; |
1423 | } | 1421 | } |
1424 | 1422 | ||