aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2018-11-14 12:49:38 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-11-27 03:56:20 -0500
commit63fd4b94b948c14eeb27a3bbf50ea0f7f0593bad (patch)
tree5ced0ca1332f9f91c55dda544e605e2a0f9bef69
parent35d7a58ac282e220a820e2bf996063a6c9a493c8 (diff)
serial: imx: fix error handling in console_setup
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>
-rw-r--r--drivers/tty/serial/imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index d4e051b578f6..dff75dc94731 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -2064,7 +2064,7 @@ imx_uart_console_setup(struct console *co, char *options)
2064 2064
2065 retval = clk_prepare(sport->clk_per); 2065 retval = clk_prepare(sport->clk_per);
2066 if (retval) 2066 if (retval)
2067 clk_disable_unprepare(sport->clk_ipg); 2067 clk_unprepare(sport->clk_ipg);
2068 2068
2069error_console: 2069error_console:
2070 return retval; 2070 return retval;