---

yaml --- r: 366832 b: refs/heads/master c: 6a2e65d h: refs/heads/master v: v3
git-mirror · Mar 25, 2013 · 160a5e0 · 160a5e0
1 parent 16a1341
commit 160a5e0
Show file tree

Hide file tree

Showing 3 changed files with 102 additions and 138 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 941604977c00ebeb6324348ece84d2140b190754
+refs/heads/master: 6a2e65d54ebb1284c4d234ec606e4eccab7eb812
diff --git a/trunk/drivers/staging/media/solo6x10/solo6x10.h b/trunk/drivers/staging/media/solo6x10/solo6x10.h
@@ -250,6 +250,13 @@ struct solo_dev {
 	void                    *vh_buf;
 	dma_addr_t		vh_dma;
 	int			vh_size;
+
+	/* Buffer handling */
+	struct videobuf_queue	vidq;
+	struct task_struct      *kthread;
+	spinlock_t		slock;
+	int			old_write;
+	struct list_head	vidq_active;
 };
 
 static inline u32 solo_reg_read(struct solo_dev *solo_dev, int reg)