Commit f4ca5030 authored Oct 07, 2016 by Javier Martinez Canillas Committed by Mauro Carvalho Chehab Nov 16, 2016

[media] exynos-gsc: don't release a non-dynamically allocated video_device



The struct v4l2_device instance for the G-Scaler is not dyanmically
allocated but a member of the struct gsc_dev. In fact, the assigned
.release callback is video_device_release_empty().

But gsc_register_m2m_device() attempts to release the v4l2_device by
calling video_device_release() in its error path. This is wrong since
the v4l2_device wasn't allocated directly and will be freed once its
parent struct gsc_dev is freed.

While being there, rename the remaining goto label in the error path
to something that better explains the error path cleanup.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent 652bb680

drivers/media/platform/exynos-gsc/gsc-m2m.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -760,24 +760,21 @@ int gsc_register_m2m_device(struct gsc_dev *gsc)
		gsc->m2m.m2m_dev = v4l2_m2m_init(&gsc_m2m_ops);
		if (IS_ERR(gsc->m2m.m2m_dev)) {
		dev_err(&pdev->dev, "failed to initialize v4l2-m2m device\n");
		ret = PTR_ERR(gsc->m2m.m2m_dev);
		goto err_m2m_r1;
		return PTR_ERR(gsc->m2m.m2m_dev);
		}

		ret = video_register_device(&gsc->vdev, VFL_TYPE_GRABBER, -1);
		if (ret) {
		dev_err(&pdev->dev,
		"%s(): failed to register video device\n", __func__);
		goto err_m2m_r2;
		goto err_m2m_release;
		}

		pr_debug("gsc m2m driver registered as /dev/video%d", gsc->vdev.num);
		return 0;

		err_m2m_r2:
		err_m2m_release:
		v4l2_m2m_release(gsc->m2m.m2m_dev);
		err_m2m_r1:
		video_device_release(gsc->m2m.vfd);

		return ret;
		}

Admin message