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

   1 From f47c9045643f91e76d8a9030828b9fe1cf4a6bcf Mon Sep 17 00:00:00 2001
   2 From: Benoit Parrot <bparrot@ti.com>
   3 Date: Mon, 29 Jun 2015 18:19:06 -0300
   4 Subject: [media] media: am437x-vpfe: Requested frame size and fmt overwritten by current sensor setting
   5
   6 From: Benoit Parrot <bparrot@ti.com>
   7
   8 commit f47c9045643f91e76d8a9030828b9fe1cf4a6bcf upstream.
   9
  10 Upon a S_FMT the input/requested frame size and pixel format is
  11 overwritten by the current sub-device settings.
  12 Fix this so application can actually set the frame size and format.
  13
  14 Fixes: 417d2e507edc ("[media] media: platform: add VPFE capture driver support for AM437X")
  15
  16 Signed-off-by: Benoit Parrot <bparrot@ti.com>
  17 Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
  18 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
  19 Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  drivers/media/platform/am437x/am437x-vpfe.c |    2 +-
  24  1 file changed, 1 insertion(+), 1 deletion(-)
  25
  26 --- a/drivers/media/platform/am437x/am437x-vpfe.c
  27 +++ b/drivers/media/platform/am437x/am437x-vpfe.c
  28 @@ -1577,7 +1577,7 @@ static int vpfe_s_fmt(struct file *file,
  29                 return -EBUSY;
  30         }
  31
  32 -       ret = vpfe_try_fmt(file, priv, fmt);
  33 +       ret = vpfe_try_fmt(file, priv, &format);
  34         if (ret)
  35                 return ret;
  36