commit 46f85978687152c53a69fc06951e386f194e7f5d
author Hans Verkuil <hverkuil@xs4all.nl> Sat Mar 30 05:31:42 2013 -0300
committer Mauro Carvalho Chehab <mchehab@redhat.com> Sun Mar 31 11:10:26 2013 -0300
tree fc06b07bdb43aa00a7782bb597c75107a57d2aaf
parent 56fa1a6a6a7da91e7ece8b01b0ae8adb2926e434

[media] em28xx: fix typo in scale_to_size()

em28xx: fix typo in scale_to_size().
The second hscale should be vscale. This bug caused xawtv to fail because it
cannot find a workable image size.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/usb/em28xx/em28xx-video.c

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index ef1959b..792ead1 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -996,7 +996,7 @@
 	}
 
 	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;