Commit fc8670d1 authored by Jonas Karlman's avatar Jonas Karlman Committed by Mauro Carvalho Chehab
Browse files

media: rockchip/vpu: Fix/re-order probe-error/remove path 



media_device_cleanup() and v4l2_m2m_unregister_media_controller() were
missing in the probe error path.
While at it, re-order calls in the remove path to unregister/cleanup
things in the reverse order they were initialized/registered.

Signed-off-by: default avatarJonas Karlman <jonas@kwiboo.se>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent f6d080f7

drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c

+5 −3
Original line number Diff line number Diff line
@@ -482,10 +482,12 @@ static int rockchip_vpu_probe(struct platform_device *pdev) 
	return 0;

err_video_dev_unreg:

	if (vpu->vfd_enc) {

		v4l2_m2m_unregister_media_controller(vpu->m2m_dev);

		video_unregister_device(vpu->vfd_enc);

		video_device_release(vpu->vfd_enc);

	}

err_m2m_rel:

	media_device_cleanup(&vpu->mdev);

	v4l2_m2m_release(vpu->m2m_dev);

err_v4l2_unreg:

	v4l2_device_unregister(&vpu->v4l2_dev);
@@ -503,13 +505,13 @@ static int rockchip_vpu_remove(struct platform_device *pdev) 
	v4l2_info(&vpu->v4l2_dev, "Removing %s\n", pdev->name);



	media_device_unregister(&vpu->mdev);

	v4l2_m2m_unregister_media_controller(vpu->m2m_dev);

	v4l2_m2m_release(vpu->m2m_dev);

	media_device_cleanup(&vpu->mdev);

	if (vpu->vfd_enc) {

		v4l2_m2m_unregister_media_controller(vpu->m2m_dev);

		video_unregister_device(vpu->vfd_enc);

		video_device_release(vpu->vfd_enc);

	}

	media_device_cleanup(&vpu->mdev);

	v4l2_m2m_release(vpu->m2m_dev);

	v4l2_device_unregister(&vpu->v4l2_dev);

	clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks);

	pm_runtime_dont_use_autosuspend(vpu->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE