---

yaml --- r: 366792 b: refs/heads/master c: 899eb84 h: refs/heads/master v: v3
git-mirror · Mar 24, 2013 · 24eff53 · 24eff53
1 parent 75d72a4
commit 24eff53
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 122 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b95dd82cd1b1e81c2019effd5e012e6989622ba9
+refs/heads/master: 899eb84ce3b50dfa8de6a12e6f39f4e30fde9781
diff --git a/trunk/drivers/staging/media/go7007/go7007-priv.h b/trunk/drivers/staging/media/go7007/go7007-priv.h
@@ -141,14 +141,6 @@ struct go7007_buffer {
 	int mapped;
 };
 
-struct go7007_file {
-	struct v4l2_fh fh;
-	struct go7007 *go;
-	struct mutex lock;
-	int buf_count;
-	struct go7007_buffer *bufs;
-};
-
 #define GO7007_RATIO_1_1	0
 #define GO7007_RATIO_4_3	1
 #define GO7007_RATIO_16_9	2
@@ -242,6 +234,9 @@ struct go7007 {
 	u32 next_seq;
 	struct list_head stream;
 	wait_queue_head_t frame_waitq;
+	int buf_count;
+	struct go7007_buffer *bufs;
+	struct v4l2_fh *bufs_owner;
 
 	/* Audio streaming */
 	void (*audio_deliver)(struct go7007 *go, u8 *buf, int length);