---

yaml --- r: 85736 b: refs/heads/master c: ce3a35d h: refs/heads/master v: v3
git-mirror · Feb 18, 2008 · a87cc0c · a87cc0c
1 parent 2991770
commit a87cc0c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ed4a6ea9dbd9f5b77ce594f7f46be022d2c49ec
+refs/heads/master: ce3a35d3c00918296e552af5ecc7b771af766436
diff --git a/trunk/drivers/media/common/saa7146_vbi.c b/trunk/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/trunk/drivers/media/common/saa7146_video.c b/trunk/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;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			    sizeof(struct saa7146_buf),
     			    file);
-    	mutex_init(&fh->video_q.lock);
     	return 0;
     }
@@ Expand Down @@