[media] media: am437x-vpfe: Requested frame size and fmt overwritten by current senso...
authorBenoit Parrot <bparrot@ti.com>
Mon, 29 Jun 2015 21:19:06 +0000 (18:19 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 17 Jul 2015 12:50:36 +0000 (09:50 -0300)
Upon a S_FMT the input/requested frame size and pixel format is
overwritten by the current sub-device settings.
Fix this so application can actually set the frame size and format.

Fixes: 417d2e507edc ("[media] media: platform: add VPFE capture driver support for AM437X")

Cc: <stable@vger.kernel.org> # v4.0+
Signed-off-by: Benoit Parrot <bparrot@ti.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/am437x/am437x-vpfe.c

index 1fba339cddc15a78b8d2f9da7da2e5e222c820b1..1fed7a56c8ae47002170bb29f949d0fafc0631e9 100644 (file)
@@ -1565,7 +1565,7 @@ static int vpfe_s_fmt(struct file *file, void *priv,
                return -EBUSY;
        }
 
-       ret = vpfe_try_fmt(file, priv, fmt);
+       ret = vpfe_try_fmt(file, priv, &format);
        if (ret)
                return ret;