Patch "[media] media: am437x-vpfe: Requested frame size and fmt overwritten by current sensor setting" has been added to the 4.1-stable tree

Patch "[media] media: am437x-vpfe: Requested frame size and fmt overwritten by current sensor setting" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    [media] media: am437x-vpfe: Requested frame size and fmt overwritten by current sensor setting

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     media-am437x-vpfe-requested-frame-size-and-fmt-overwritten-by-current-sensor-setting.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From f47c9045643f91e76d8a9030828b9fe1cf4a6bcf Mon Sep 17 00:00:00 2001
From: Benoit Parrot <bparrot@ti.com>
Date: Mon, 29 Jun 2015 18:19:06 -0300
Subject: [media] media: am437x-vpfe: Requested frame size and fmt overwritten by current sensor setting

From: Benoit Parrot <bparrot@ti.com>

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 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -1577,7 +1577,7 @@ static int vpfe_s_fmt(struct file *file,
 		return -EBUSY;
 	}
 
-	ret = vpfe_try_fmt(file, priv, fmt);
+	ret = vpfe_try_fmt(file, priv, &format);
 	if (ret)
 		return ret;
 


Patches currently in stable-queue which might be from bparrot@ti.com are

queue-4.1/media-am437x-vpfe-fix-a-race-condition-during-release.patch
queue-4.1/media-am437x-vpfe-requested-frame-size-and-fmt-overwritten-by-current-sensor-setting.patch