spi: atmel-quadspi: Don't leak clk enable count in pm resume
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 17 Mar 2023 08:42:30 +0000 (09:42 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 17 Mar 2023 15:47:49 +0000 (15:47 +0000)
The pm resume call is supposed to enable two clocks. If the second enable
fails the callback reports failure but doesn't undo the first enable.

So call clk_disable() for the first clock when clk_enable() for the second
one fails.

Fixes: 4a2f83b7f780 ("spi: atmel-quadspi: add runtime pm support")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Link: https://lore.kernel.org/r/20230317084232.142257-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/atmel-quadspi.c

index f4632cb..0c6f80d 100644 (file)
@@ -786,7 +786,11 @@ static int __maybe_unused atmel_qspi_runtime_resume(struct device *dev)
        if (ret)
                return ret;
 
-       return clk_enable(aq->qspick);
+       ret = clk_enable(aq->qspick);
+       if (ret)
+               clk_disable(aq->pclk);
+
+       return ret;
 }
 
 static const struct dev_pm_ops __maybe_unused atmel_qspi_pm_ops = {