]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: ti-vpe: cal: fix error handling in cal_camerarx_create
authorTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Mon, 14 Jun 2021 11:23:12 +0000 (13:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 18 Sep 2021 11:41:58 +0000 (13:41 +0200)
[ Upstream commit 918d6d120a60c2640263396308eeb2b6afeb0cd6 ]

cal_camerarx_create() doesn't handle error returned from
cal_camerarx_sd_init_cfg(). Fix this.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/ti-vpe/cal-camerarx.c

index cbe6114908de772cc1b490b8a4b1abe43979e711..63d13bcc83b47a748098eb961ab16d4057646b4e 100644 (file)
@@ -842,7 +842,9 @@ struct cal_camerarx *cal_camerarx_create(struct cal_dev *cal,
        if (ret)
                goto error;
 
-       cal_camerarx_sd_init_cfg(sd, NULL);
+       ret = cal_camerarx_sd_init_cfg(sd, NULL);
+       if (ret)
+               goto error;
 
        ret = v4l2_device_register_subdev(&cal->v4l2_dev, sd);
        if (ret)