Commit 4603a5b4 authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Mauro Carvalho Chehab

media: marvell-ccic: Add missed v4l2_async_notifier_cleanup()

mccic_register() forgets to cleanup the notifier in its error handler.
mccic_shutdown() also misses calling v4l2_async_notifier_cleanup().
Add the missed calls to fix them.

Fixes: 3eefe36c ("media: marvell-ccic: use async notifier to get the sensor")
Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 1e8d3bbc
...@@ -1940,6 +1940,7 @@ int mccic_register(struct mcam_camera *cam) ...@@ -1940,6 +1940,7 @@ int mccic_register(struct mcam_camera *cam)
out: out:
v4l2_async_notifier_unregister(&cam->notifier); v4l2_async_notifier_unregister(&cam->notifier);
v4l2_device_unregister(&cam->v4l2_dev); v4l2_device_unregister(&cam->v4l2_dev);
v4l2_async_notifier_cleanup(&cam->notifier);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(mccic_register); EXPORT_SYMBOL_GPL(mccic_register);
...@@ -1961,6 +1962,7 @@ void mccic_shutdown(struct mcam_camera *cam) ...@@ -1961,6 +1962,7 @@ void mccic_shutdown(struct mcam_camera *cam)
v4l2_ctrl_handler_free(&cam->ctrl_handler); v4l2_ctrl_handler_free(&cam->ctrl_handler);
v4l2_async_notifier_unregister(&cam->notifier); v4l2_async_notifier_unregister(&cam->notifier);
v4l2_device_unregister(&cam->v4l2_dev); v4l2_device_unregister(&cam->v4l2_dev);
v4l2_async_notifier_cleanup(&cam->notifier);
} }
EXPORT_SYMBOL_GPL(mccic_shutdown); EXPORT_SYMBOL_GPL(mccic_shutdown);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment