diff --git a/[refs] b/[refs]
index 0ddec8e88e6c..aa88a818b31c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e66793b622feb383dec59d9c044a4c908d7c5c7
+refs/heads/master: 9f1b9efa6712201aacc590b3250e6f39f9e13f21
diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c
index 90ef3ae39c1c..db9ff4a8ad85 100644
--- a/trunk/drivers/media/video/zoran/zoran_driver.c
+++ b/trunk/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);