| From 793381ea1f5719cf9fdc988d30db2cee41b21430 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 3 Jun 2020 18:40:48 +0200 |
| Subject: media: marvell-ccic: Add missed v4l2_async_notifier_cleanup() |
| |
| From: Chuhong Yuan <hslester96@gmail.com> |
| |
| [ Upstream commit 4603a5b4a87ccd6fb90cbfa10195291cfcf6ba34 ] |
| |
| 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: 3eefe36cc00c ("media: marvell-ccic: use async notifier to get the sensor") |
| Signed-off-by: Chuhong Yuan <hslester96@gmail.com> |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/marvell-ccic/mcam-core.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c |
| index 09775b6624c6b..326e79b8531c5 100644 |
| --- a/drivers/media/platform/marvell-ccic/mcam-core.c |
| +++ b/drivers/media/platform/marvell-ccic/mcam-core.c |
| @@ -1940,6 +1940,7 @@ int mccic_register(struct mcam_camera *cam) |
| out: |
| v4l2_async_notifier_unregister(&cam->notifier); |
| v4l2_device_unregister(&cam->v4l2_dev); |
| + v4l2_async_notifier_cleanup(&cam->notifier); |
| return ret; |
| } |
| EXPORT_SYMBOL_GPL(mccic_register); |
| @@ -1961,6 +1962,7 @@ void mccic_shutdown(struct mcam_camera *cam) |
| v4l2_ctrl_handler_free(&cam->ctrl_handler); |
| v4l2_async_notifier_unregister(&cam->notifier); |
| v4l2_device_unregister(&cam->v4l2_dev); |
| + v4l2_async_notifier_cleanup(&cam->notifier); |
| } |
| EXPORT_SYMBOL_GPL(mccic_shutdown); |
| |
| -- |
| 2.25.1 |
| |