From 12a76b317c90054c380ee2013cd4a0e0daf77f08 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Mon, 7 Feb 2011 18:09:30 -0300
Subject: [PATCH] --- yaml --- r: 241907 b: refs/heads/master c:
 8eb4476d44b39fe2f5829de030328223bda2abaf h: refs/heads/master i:   241905:
 2b0c1d405f8507722d9c74fea22d3882561c6664   241903:
 911f4bd2e9d8f33288e9091bac526139b5e2c15e v: v3

---
 [refs]                           |  2 +-
 trunk/include/media/soc_camera.h | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b09ffd435cbe..5b8bad3aa6fe 100644
--- 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
index e29ff74fbe32..6e96b2657b5c 100644
--- 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);