Commit 9bbc3dca authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman

tty: serial: mxs-auart: Check the return value from clk_prepare_enable()

clk_prepare_enable() may fail, so let's check its return value and propagate it
in the case of error.
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 753023dc
...@@ -734,9 +734,12 @@ static void mxs_auart_reset(struct uart_port *u) ...@@ -734,9 +734,12 @@ static void mxs_auart_reset(struct uart_port *u)
static int mxs_auart_startup(struct uart_port *u) static int mxs_auart_startup(struct uart_port *u)
{ {
int ret;
struct mxs_auart_port *s = to_auart_port(u); struct mxs_auart_port *s = to_auart_port(u);
clk_prepare_enable(s->clk); ret = clk_prepare_enable(s->clk);
if (ret)
return ret;
writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_CLR); writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_CLR);
...@@ -957,7 +960,9 @@ auart_console_setup(struct console *co, char *options) ...@@ -957,7 +960,9 @@ auart_console_setup(struct console *co, char *options)
if (!s) if (!s)
return -ENODEV; return -ENODEV;
clk_prepare_enable(s->clk); ret = clk_prepare_enable(s->clk);
if (ret)
return ret;
if (options) if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow); uart_parse_options(options, &baud, &parity, &bits, &flow);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment