diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-02 10:43:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-02 11:39:05 -0400 |
commit | 27d68fbbd555765974052ef2f5a14824da0818fe (patch) | |
tree | 0b69cc1a26533b4208ac9665a08b16da53553450 | |
parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) |
Staging: solo6x10: fix build problem
With commit 08bff03ed697a583612b62a6ac566bd5bce98012 (V4L/DVB: videobuf:
add ext_lock argument to the queue init functions)
videobuf_queue_sg_init() changed to need another paramater. This patch
fixes that issue.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 | ||||
-rw-r--r-- | drivers/staging/solo6x10/solo6010-v4l2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/drivers/staging/solo6x10/solo6010-v4l2-enc.c index bbf3d9c4abb0..097e82bc7a63 100644 --- a/drivers/staging/solo6x10/solo6010-v4l2-enc.c +++ b/drivers/staging/solo6x10/solo6010-v4l2-enc.c | |||
@@ -766,7 +766,7 @@ static int solo_enc_open(struct file *file) | |||
766 | &solo_enc->lock, | 766 | &solo_enc->lock, |
767 | V4L2_BUF_TYPE_VIDEO_CAPTURE, | 767 | V4L2_BUF_TYPE_VIDEO_CAPTURE, |
768 | V4L2_FIELD_INTERLACED, | 768 | V4L2_FIELD_INTERLACED, |
769 | sizeof(struct videobuf_buffer), fh); | 769 | sizeof(struct videobuf_buffer), fh, NULL); |
770 | 770 | ||
771 | spin_unlock(&solo_enc->lock); | 771 | spin_unlock(&solo_enc->lock); |
772 | 772 | ||
diff --git a/drivers/staging/solo6x10/solo6010-v4l2.c b/drivers/staging/solo6x10/solo6010-v4l2.c index 9731fa02b5e8..6ffd21de837d 100644 --- a/drivers/staging/solo6x10/solo6010-v4l2.c +++ b/drivers/staging/solo6x10/solo6010-v4l2.c | |||
@@ -437,7 +437,7 @@ static int solo_v4l2_open(struct file *file) | |||
437 | &solo_dev->pdev->dev, &fh->slock, | 437 | &solo_dev->pdev->dev, &fh->slock, |
438 | V4L2_BUF_TYPE_VIDEO_CAPTURE, | 438 | V4L2_BUF_TYPE_VIDEO_CAPTURE, |
439 | SOLO_DISP_PIX_FIELD, | 439 | SOLO_DISP_PIX_FIELD, |
440 | sizeof(struct videobuf_buffer), fh); | 440 | sizeof(struct videobuf_buffer), fh, NULL); |
441 | 441 | ||
442 | return 0; | 442 | return 0; |
443 | } | 443 | } |