Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ce3a35d3c00918296e552af5ecc7b771af766436 Commit: ce3a35d3c00918296e552af5ecc7b771af766436 Parent: 0ed4a6ea9dbd9f5b77ce594f7f46be022d2c49ec Author: Mauro Carvalho Chehab <[EMAIL PROTECTED]> AuthorDate: Thu Jan 31 13:40:04 2008 -0300 Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]> CommitDate: Mon Feb 18 11:15:11 2008 -0300
V4L/DVB (7120): videobuf lock is already initialized at videobuf-core.c Removes the duplicated mutex_init code. Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]> --- drivers/media/common/saa7146_vbi.c | 1 - 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 c32dda9..bfbd5a8 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 c31ab48..66fdbd0 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; } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html