mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 23:52:08 +02:00
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: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Pratyush Yadav <p.yadav@ti.com> Tested-by: Julien Massot <julien.massot@collabora.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Reviewed-by: Maxime Ripard <mripard@kernel.org> Signed-off-by: Jai Luthra <j-luthra@ti.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
parent
b270171530
commit
aee5b415c9
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user