If the requested pixelformat is not supported only revert to the current
pixelformat, do not revert the entire format. Also if the pixelformat
needs to be reverted the pixel information needs to be fetched once
more.

Signed-off-by: Niklas Söderlund <[email protected]>
---
 drivers/media/platform/rcar-vin/rcar-v4l2.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c 
b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index 956092ba6ef9bc6f..27b7733e96afe3e9 100644
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -226,9 +226,8 @@ static int __rvin_try_format(struct rvin_dev *vin,
        if (!info) {
                vin_dbg(vin, "Format %x not found, keeping %x\n",
                        pix->pixelformat, vin->format.pixelformat);
-               *pix = vin->format;
-               pix->width = rwidth;
-               pix->height = rheight;
+               pix->pixelformat = vin->format.pixelformat;
+               info = rvin_format_from_pixel(pix->pixelformat);
        }
 
        /* Always recalculate */
-- 
2.12.0

Reply via email to