[PATCH 1/4] media: imx-media-csi: fix v4l2-compliance check

Russell King rmk+kernel at armlinux.org.uk
Sun Mar 19 03:48:52 PDT 2017


v4l2-compliance was failing with:

                fail: v4l2-test-formats.cpp(1076): cap->timeperframe.numerator == 0 || cap->timeperframe.denominator == 0
                test VIDIOC_G/S_PARM: FAIL

Fix this.

Signed-off-by: Russell King <rmk+kernel at armlinux.org.uk>
---
 drivers/staging/media/imx/imx-media-csi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 0336891069dc..65346e789dd6 100644
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -680,8 +680,10 @@ static const struct csi_skip_desc *csi_find_best_skip(struct v4l2_fract *in,
 
 	/* Default to 1:1 ratio */
 	if (out->numerator == 0 || out->denominator == 0 ||
-	    in->numerator == 0 || in->denominator == 0)
+	    in->numerator == 0 || in->denominator == 0) {
+		*out = *in;
 		return best_skip;
+	}
 
 	want_us = div_u64((u64)USEC_PER_SEC * out->numerator, out->denominator);
 
-- 
2.7.4




More information about the linux-arm-kernel mailing list