diff --git a/[refs] b/[refs]
index 903f68c28933..2b99c21d451a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56fa1a6a6a7da91e7ece8b01b0ae8adb2926e434
+refs/heads/master: 46f85978687152c53a69fc06951e386f194e7f5d
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-video.c b/trunk/drivers/media/usb/em28xx/em28xx-video.c
index ef1959bbd23f..792ead1025d7 100644
--- a/trunk/drivers/media/usb/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/usb/em28xx/em28xx-video.c
@@ -996,7 +996,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 	}
 
 	size_to_scale(dev, width, height, &hscale, &vscale);
-	scale_to_size(dev, hscale, hscale, &width, &height);
+	scale_to_size(dev, hscale, vscale, &width, &height);
 
 	f->fmt.pix.width = width;
 	f->fmt.pix.height = height;