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; }