git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From f71920efb1066d71d74811e1dbed658173adf9bf Mon Sep 17 00:00:00 2001
   2 From: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
   3 Date: Sat, 14 Jun 2014 08:37:09 -0300
   4 Subject: media: media: v4l2-core: v4l2-dv-timings.c: Cleaning up code wrong value used in aspect ratio
   5
   6 From: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
   7
   8 commit f71920efb1066d71d74811e1dbed658173adf9bf upstream.
   9
  10 Wrong value used in same cases for the aspect ratio.
  11
  12 Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
  13 Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
  14 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
  15 Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17
  18 ---
  19  drivers/media/v4l2-core/v4l2-dv-timings.c |    4 ++--
  20  1 file changed, 2 insertions(+), 2 deletions(-)
  21
  22 --- a/drivers/media/v4l2-core/v4l2-dv-timings.c
  23 +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
  24 @@ -599,10 +599,10 @@ struct v4l2_fract v4l2_calc_aspect_ratio
  25                 aspect.denominator = 9;
  26         } else if (ratio == 34) {
  27                 aspect.numerator = 4;
  28 -               aspect.numerator = 3;
  29 +               aspect.denominator = 3;
  30         } else if (ratio == 68) {
  31                 aspect.numerator = 15;
  32 -               aspect.numerator = 9;
  33 +               aspect.denominator = 9;
  34         } else {
  35                 aspect.numerator = hor_landscape + 99;
  36                 aspect.denominator = 100;