---

yaml --- r: 228040 b: refs/heads/master c: 319fb3b h: refs/heads/master v: v3
git-mirror · Nov 5, 2010 · cf8d920 · cf8d920
1 parent d994d40
commit cf8d920
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f62de9be26ce2144ad0dcf292727e4f58577d401
+refs/heads/master: 319fb3bacc517829cbd4d758f3b8969fdbde5c92
diff --git a/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c
@@ -814,7 +814,7 @@ static int solo_enc_buf_prepare(struct videobuf_queue *vq,
 		int rc = videobuf_iolock(vq, vb, NULL);
 		if (rc < 0) {
 			struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
-			videobuf_dma_unmap(vq, dma);
+			videobuf_dma_unmap(vq->dev, dma);
 			videobuf_dma_free(dma);
 			vb->state = VIDEOBUF_NEEDS_INIT;
 			return rc;
@@ -840,7 +840,7 @@ static void solo_enc_buf_release(struct videobuf_queue *vq,
 {
 	struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
 
-	videobuf_dma_unmap(vq, dma);
+	videobuf_dma_unmap(vq->dev, dma);
 	videobuf_dma_free(dma);
 	vb->state = VIDEOBUF_NEEDS_INIT;
 }
@@ -886,7 +886,7 @@ static int solo_enc_open(struct file *file)
 			       &solo_enc->lock,
 			       V4L2_BUF_TYPE_VIDEO_CAPTURE,
 			       V4L2_FIELD_INTERLACED,
-			       sizeof(struct videobuf_buffer), fh);
+			       sizeof(struct videobuf_buffer), fh, NULL);
 
 	return 0;
 }

diff --git a/trunk/drivers/staging/solo6x10/solo6010-v4l2.c b/trunk/drivers/staging/solo6x10/solo6010-v4l2.c
@@ -462,7 +462,7 @@ static int solo_buf_prepare(struct videobuf_queue *vq,
 		int rc = videobuf_iolock(vq, vb, NULL);
 		if (rc < 0) {
 			struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
-			videobuf_dma_unmap(vq, dma);
+			videobuf_dma_unmap(vq->dev, dma);
 			videobuf_dma_free(dma);
 			vb->state = VIDEOBUF_NEEDS_INIT;
 			return rc;
@@ -489,7 +489,7 @@ static void solo_buf_release(struct videobuf_queue *vq,
 {
 	struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
 
-	videobuf_dma_unmap(vq, dma);
+	videobuf_dma_unmap(vq->dev, dma);
 	videobuf_dma_free(dma);
 	vb->state = VIDEOBUF_NEEDS_INIT;
 }
@@ -539,7 +539,7 @@ static int solo_v4l2_open(struct file *file)
 			       &solo_dev->pdev->dev, &fh->slock,
 			       V4L2_BUF_TYPE_VIDEO_CAPTURE,
 			       SOLO_DISP_PIX_FIELD,
-			       sizeof(struct videobuf_buffer), fh);
+			       sizeof(struct videobuf_buffer), fh, NULL);
 
 	return 0;
 }