if imx7_csi_try_fmt() fails, cc variable won't be
initialized and csi->cc[sdformat->pad] would be pointing
to a random location.

Reported-by: Dan Carpenter <dan.carpen...@oracle.com>
Signed-off-by: Rui Miguel Silva <rui.si...@linaro.org>
---
 drivers/staging/media/imx/imx7-media-csi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/imx/imx7-media-csi.c 
b/drivers/staging/media/imx/imx7-media-csi.c
index 3fba7c27c0ec..894e5be3f17c 100644
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1051,7 +1051,9 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
                goto out_unlock;
        }
 
-       imx7_csi_try_fmt(csi, cfg, sdformat, &cc);
+       ret = imx7_csi_try_fmt(csi, cfg, sdformat, &cc);
+       if (ret < 0)
+               goto out_unlock;
 
        fmt = imx7_csi_get_format(csi, cfg, sdformat->pad, sdformat->which);
        if (!fmt) {
-- 
2.20.1

Reply via email to