]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
media: am437x-vpfe: Requested frame size and fmt overwritten by current sensor setting
authorBenoit Parrot <bparrot@ti.com>
Mon, 29 Jun 2015 21:19:06 +0000 (18:19 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Sep 2015 17:26:07 +0000 (19:26 +0200)
commit f47c9045643f91e76d8a9030828b9fe1cf4a6bcf upstream.

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")
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/platform/am437x/am437x-vpfe.c

index a30cc2f7e4f1268445c8cb2763bcacda57665beb..4e86f8d8ca26f233650b89eb80a2153757640a8e 100644 (file)
@@ -1577,7 +1577,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;