aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/atmel-isi.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-08-24 09:30:21 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:28:28 -0400
commitfc714e70dd063e6887d09872ac6158b0c20cc817 (patch)
treea77f60bcc14a452c67166c0c4d4a2039efb2f9c2 /drivers/media/video/atmel-isi.c
parent55093284fb6f9009a339e522773417bdd54ec144 (diff)
[media] V4L: vb2: prepare to support multi-size buffers
In preparation for the forthcoming VIDIOC_CREATE_BUFS ioctl add a "const struct v4l2_format *" argument to the .queue_setup() vb2 operation. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/atmel-isi.c')
-rw-r--r--drivers/media/video/atmel-isi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/atmel-isi.c b/drivers/media/video/atmel-isi.c
index 06f6595a1c9a..8c775c59e120 100644
--- a/drivers/media/video/atmel-isi.c
+++ b/drivers/media/video/atmel-isi.c
@@ -249,9 +249,9 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset)
249/* ------------------------------------------------------------------ 249/* ------------------------------------------------------------------
250 Videobuf operations 250 Videobuf operations
251 ------------------------------------------------------------------*/ 251 ------------------------------------------------------------------*/
252static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, 252static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
253 unsigned int *nplanes, unsigned int sizes[], 253 unsigned int *nbuffers, unsigned int *nplanes,
254 void *alloc_ctxs[]) 254 unsigned int sizes[], void *alloc_ctxs[])
255{ 255{
256 struct soc_camera_device *icd = soc_camera_from_vb2q(vq); 256 struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
257 struct soc_camera_host *ici = to_soc_camera_host(icd->parent); 257 struct soc_camera_host *ici = to_soc_camera_host(icd->parent);