[PATCH 4/5] Staging: solo6x10: Pass new parameter to videobuf_queue_dma_contig_init()

Ben Hutchings ben at decadent.org.uk
Sun Nov 7 17:23:32 UTC 2010


Commit 08bff03ed697a583612b62a6ac566bd5bce98012 ("V4L/DVB: videobuf:
add ext_lock argument to the queue init functions") added a parameter
to this function but did not update this driver.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
Compile-tested only.  This should be 2.6.37 material.

Ben.

 drivers/staging/solo6x10/solo6010-v4l2-enc.c |    3 ++-
 drivers/staging/solo6x10/solo6010-v4l2.c     |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/drivers/staging/solo6x10/solo6010-v4l2-enc.c
index bbf3d9c..a0b5b85 100644
--- a/drivers/staging/solo6x10/solo6010-v4l2-enc.c
+++ b/drivers/staging/solo6x10/solo6010-v4l2-enc.c
@@ -766,7 +766,8 @@ 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);
 
 	spin_unlock(&solo_enc->lock);
 
diff --git a/drivers/staging/solo6x10/solo6010-v4l2.c b/drivers/staging/solo6x10/solo6010-v4l2.c
index 9731fa0..4349331 100644
--- a/drivers/staging/solo6x10/solo6010-v4l2.c
+++ b/drivers/staging/solo6x10/solo6010-v4l2.c
@@ -437,7 +437,8 @@ 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;
 }
-- 
1.7.2.3






More information about the devel mailing list