From 7fdad17aa5f5e0f8d164613e27d828962100b4c9 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 31 Jan 2008 11:40:04 -0200 Subject: videobuf lock is already initialized at videobuf-core.c From: Mauro Carvalho Chehab Removes the duplicated mutex_init code. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/common/saa7146_vbi.c | 1 - linux/drivers/media/common/saa7146_video.c | 2 -- 2 files changed, 3 deletions(-) (limited to 'linux/drivers/media/common') 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; } -- cgit v1.2.3