From: Niklas Söderlund Date: Wed, 4 Dec 2019 17:57:59 +0000 (+0100) Subject: media: rcar-vin: Use correct pixel format when aligning format X-Git-Tag: v5.6-rc1~93^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fd4d9cb739bd47b74840f8933616cc75341db05;p=thirdparty%2Flinux.git media: rcar-vin: Use correct pixel format when aligning format When aligning the format the pixel format that is being processed shall be used to figure out alignment constraints, not the currently active pixel format. The alignment might be part of a try operation and shall not be effected by the active format. Fix this by looking at the correct pixel format. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 9e2e63ffcc47a..5ff565e76bca8 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -144,7 +144,7 @@ static void rvin_format_align(struct rvin_dev *vin, struct v4l2_pix_format *pix) } /* HW limit width to a multiple of 32 (2^5) for NV12/16 else 2 (2^1) */ - switch (vin->format.pixelformat) { + switch (pix->pixelformat) { case V4L2_PIX_FMT_NV12: case V4L2_PIX_FMT_NV16: walign = 5;