Commit aee5b415 authored by Pratyush Yadav's avatar Pratyush Yadav Committed by Hans Verkuil
Browse files

media: cadence: csi2rx: Cleanup media entity properly 



Call media_entity_cleanup() in probe error path and remove to make sure
the media entity is cleaned up properly.

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarPratyush Yadav <p.yadav@ti.com>
Tested-by: default avatarJulien Massot <julien.massot@collabora.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Signed-off-by: default avatarJai Luthra <j-luthra@ti.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent b2701715

drivers/media/platform/cadence/cdns-csi2rx.c

+2 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ static int csi2rx_probe(struct platform_device *pdev) 
err_cleanup:

	v4l2_async_nf_unregister(&csi2rx->notifier);

	v4l2_async_nf_cleanup(&csi2rx->notifier);

	media_entity_cleanup(&csi2rx->subdev.entity);

err_free_priv:

	kfree(csi2rx);

	return ret;
@@ -559,6 +560,7 @@ static void csi2rx_remove(struct platform_device *pdev) 
	v4l2_async_nf_unregister(&csi2rx->notifier);

	v4l2_async_nf_cleanup(&csi2rx->notifier);

	v4l2_async_unregister_subdev(&csi2rx->subdev);

	media_entity_cleanup(&csi2rx->subdev.entity);

	kfree(csi2rx);

}