serial: imx: fix error handling in console_setup

[ Upstream commit 63fd4b94b948c14eeb27a3bbf50ea0f7f0593bad ]

The ipg clock only needs to be unprepared in case preparing
per clock fails. The ipg clock has already disabled at the point.

Fixes: 1cf93e0d5488 ("serial: imx: remove the uart_console() check")
Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 0d82be145c680a33b4ce7529b381364585d9f7ec..6d596c6351591bc02103441f0e02b06a0c4c921f 100644 (file)
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1943,7 +1943,7 @@ imx_console_setup(struct console *co, char *options)
 
        retval = clk_prepare(sport->clk_per);
        if (retval)
-               clk_disable_unprepare(sport->clk_ipg);
+               clk_unprepare(sport->clk_ipg);
 
 error_console:
        return retval;