---

yaml --- r: 241907 b: refs/heads/master c: 8eb4476 h: refs/heads/master i: 241905: 2b0c1d4 241903: 911f4bd v: v3
git-mirror · Mar 21, 2011 · 12a76b3 · 12a76b3
1 parent 0c8aab6
commit 12a76b3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 592c2aba266ca5be0dce300d0400817d943d49af
+refs/heads/master: 8eb4476d44b39fe2f5829de030328223bda2abaf
diff --git a/trunk/include/media/soc_camera.h b/trunk/include/media/soc_camera.h
@@ -306,6 +306,16 @@ static inline struct video_device *soc_camera_i2c_to_vdev(struct i2c_client *cli
 	return icd->vdev;
 }
 
+static inline struct soc_camera_device *soc_camera_from_vb2q(struct vb2_queue *vq)
+{
+	return container_of(vq, struct soc_camera_device, vb2_vidq);
+}
+
+static inline struct soc_camera_device *soc_camera_from_vbq(struct videobuf_queue *vq)
+{
+	return container_of(vq, struct soc_camera_device, vb_vidq);
+}
+
 void soc_camera_lock(struct vb2_queue *vq);
 void soc_camera_unlock(struct vb2_queue *vq);