From e74b236a470ae38ec01d64379e7fc075c0e8273d Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 30 Jan 2013 11:59:48 -0300 Subject: [PATCH] --- yaml --- r: 357451 b: refs/heads/master c: 11d379395291609f95cf1e102f9f23892b83a493 h: refs/heads/master i: 357449: 380bd51235069fa71fdf77810daacd6a8ef9abe5 357447: 8a4136525746477e0fba6ca4154b17c3406c3dbe v: v3 --- [refs] | 2 +- trunk/drivers/media/parport/bw-qcam.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 03f70343892e..22be29591af3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bbc5820ffe1675c923ed0b82952cc64a610bd5d +refs/heads/master: 11d379395291609f95cf1e102f9f23892b83a493 diff --git a/trunk/drivers/media/parport/bw-qcam.c b/trunk/drivers/media/parport/bw-qcam.c index 5b75a64b199b..497b342b0f72 100644 --- a/trunk/drivers/media/parport/bw-qcam.c +++ b/trunk/drivers/media/parport/bw-qcam.c @@ -693,6 +693,7 @@ static int qcam_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f pix->sizeimage = pix->width * pix->height; /* Just a guess */ pix->colorspace = V4L2_COLORSPACE_SRGB; + pix->priv = 0; return 0; } @@ -718,6 +719,7 @@ static int qcam_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format pix->sizeimage = pix->width * pix->height; /* Just a guess */ pix->colorspace = V4L2_COLORSPACE_SRGB; + pix->priv = 0; return 0; }