diff options
author | Stefan Agner <stefan@agner.ch> | 2018-11-14 18:49:38 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-27 09:56:20 +0100 |
commit | 63fd4b94b948c14eeb27a3bbf50ea0f7f0593bad (patch) | |
tree | 5ced0ca1332f9f91c55dda544e605e2a0f9bef69 /drivers/tty/serial/imx.c | |
parent | 35d7a58ac282e220a820e2bf996063a6c9a493c8 (diff) | |
download | linux-stable-63fd4b94b948c14eeb27a3bbf50ea0f7f0593bad.tar.gz linux-stable-63fd4b94b948c14eeb27a3bbf50ea0f7f0593bad.tar.bz2 linux-stable-63fd4b94b948c14eeb27a3bbf50ea0f7f0593bad.zip |
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>
Diffstat (limited to 'drivers/tty/serial/imx.c')
-rw-r--r-- | drivers/tty/serial/imx.c | 2 |
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) retval = clk_prepare(sport->clk_per); if (retval) - clk_disable_unprepare(sport->clk_ipg); + clk_unprepare(sport->clk_ipg); error_console: return retval; |