V4L/DVB (10707): zoran: set bytesperline to 0 when using MJPEG.

Remove bogus check on bytesperline in the try_fmt_vid_out call.
Just set it to 0.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 90ef3ae39c1c2d6d66302747cc70528e186c354b..db9ff4a8ad85c85587113196fc6878ff0689ca9a 100644 (file)
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -2549,12 +2549,11 @@ static int zoran_try_fmt_vid_out(struct file *file, void *__fh,
        struct zoran_jpg_settings settings;
        int res = 0;
 
-       if (fmt->fmt.pix.bytesperline > 0)
-               return -EINVAL;
-
        if (fmt->fmt.pix.pixelformat != V4L2_PIX_FMT_MJPEG)
                return -EINVAL;
 
+       fmt->fmt.pix.bytesperline = 0;
+
        mutex_lock(&zr->resource_lock);
        settings = fh->jpg_settings;
 
@@ -2608,9 +2607,6 @@ static int zoran_try_fmt_vid_cap(struct file *file, void *__fh,
        struct zoran *zr = fh->zr;
        int i;
 
-       if (fmt->fmt.pix.bytesperline > 0)
-               return -EINVAL;
-
        if (fmt->fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG)
                return zoran_try_fmt_vid_out(file, fh, fmt);