summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorBenoit Parrot <bparrot@ti.com>2015-06-29 18:19:06 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-07-17 09:50:36 -0300
commitf47c9045643f91e76d8a9030828b9fe1cf4a6bcf (patch)
tree192fab768fd63790adafcdd32a44d1700de02ceb /drivers/media/platform
parent2f8e75d2762496bb2fcea7fa437a3339d2a6d9d4 (diff)
downloadlinux-f47c9045643f91e76d8a9030828b9fe1cf4a6bcf.tar.bz2
[media] media: am437x-vpfe: Requested frame size and fmt overwritten by current sensor setting
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>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/am437x/am437x-vpfe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index 1fba339cddc1..1fed7a56c8ae 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -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;