---

yaml --- r: 366931 b: refs/heads/master c: 46f8597 h: refs/heads/master i: 366929: cbd2059 366927: 5df567a v: v3
git-mirror · Mar 31, 2013 · f1a08fe · f1a08fe
1 parent 5178753
commit f1a08fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;