diff mbox

[2.6.37-rc1] SoC Camera: OMAP1: update for recent videobuf changes

Message ID 201011021622.33156.jkrzyszt@tis.icnet.pl (mailing list archive)
State Accepted
Headers show

Commit Message

Janusz Krzysztofik Nov. 2, 2010, 3:22 p.m. UTC 
None
diff mbox

Patch

--- linux-2.6.37-rc1/drivers/media/video/omap1_camera.c.orig	2010-11-01 22:41:59.000000000 +0100
+++ linux-2.6.37-rc1/drivers/media/video/omap1_camera.c	2010-11-01 23:55:26.000000000 +0100
@@ -235,7 +235,7 @@  static void free_buffer(struct videobuf_
 
 	BUG_ON(in_interrupt());
 
-	videobuf_waiton(vb, 0, 0);
+	videobuf_waiton(vq, vb, 0, 0);
 
 	if (vb_mode == OMAP1_CAM_DMA_CONTIG) {
 		videobuf_dma_contig_free(vq, vb);
@@ -1365,12 +1365,12 @@  static void omap1_cam_init_videobuf(stru
 		videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops,
 				icd->dev.parent, &pcdev->lock,
 				V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
-				sizeof(struct omap1_cam_buf), icd);
+				sizeof(struct omap1_cam_buf), icd, NULL);
 	else
 		videobuf_queue_sg_init(q, &omap1_videobuf_ops,
 				icd->dev.parent, &pcdev->lock,
 				V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
-				sizeof(struct omap1_cam_buf), icd);
+				sizeof(struct omap1_cam_buf), icd, NULL);
 
 	/* use videobuf mode (auto)selected with the module parameter */
 	pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;