| From 91a557d48a69ed91b7be227ca59dfc0e9d756239 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 22 Nov 2023 16:21:34 +0100 |
| Subject: media: imx-mipi-csis: Fix clock handling in remove() |
| |
| From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> |
| |
| [ Upstream commit 5705b0e0eb550ff834125a46a4ef99b62093d83d ] |
| |
| The driver always calls mipi_csis_runtime_suspend() and |
| mipi_csis_clk_disable() in remove(). This causes multiple WARNs from the |
| kernel, as the clocks get disabled too many times. |
| |
| Fix the remove() to call mipi_csis_runtime_suspend() and |
| mipi_csis_clk_disable() in a way that reverses what is done in probe(). |
| |
| Link: https://lore.kernel.org/r/20231122-imx-csis-v2-1-e44b8dc4cb66@ideasonboard.com |
| |
| Fixes: 7807063b862b ("media: staging/imx7: add MIPI CSI-2 receiver subdev for i.MX7") |
| Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> |
| Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/nxp/imx-mipi-csis.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c |
| index 905072871ed2..196f2bba419f 100644 |
| --- a/drivers/media/platform/nxp/imx-mipi-csis.c |
| +++ b/drivers/media/platform/nxp/imx-mipi-csis.c |
| @@ -1553,8 +1553,10 @@ static int mipi_csis_remove(struct platform_device *pdev) |
| v4l2_async_nf_cleanup(&csis->notifier); |
| v4l2_async_unregister_subdev(&csis->sd); |
| |
| + if (!pm_runtime_enabled(&pdev->dev)) |
| + mipi_csis_runtime_suspend(&pdev->dev); |
| + |
| pm_runtime_disable(&pdev->dev); |
| - mipi_csis_runtime_suspend(&pdev->dev); |
| mipi_csis_clk_disable(csis); |
| media_entity_cleanup(&csis->sd.entity); |
| fwnode_handle_put(csis->sd.fwnode); |
| -- |
| 2.43.0 |
| |
