hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tty: serial: mxs-auart: fix error handling in mxs_auart_probe 

If uart_add_one_port() fails in mxs_auart_probe, the clks has
to be disabled.Two clks are previously enabled in mxs_get_clks().
Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Branislav Radocaj <branislav@radocaj.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Branislav Radocaj 2017-12-07 14:11:47 +01:00 committed by Greg Kroah-Hartman
parent 6a28fd2bbc
commit 5c3055393f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/tty/serial/mxs-auart.c
View File

@ -1721,7 +1721,7 @@ static int mxs_auart_probe(struct platform_device *pdev)
ret = uart_add_one_port(&auart_driver, &s->port); ret = uart_add_one_port(&auart_driver, &s->port);
if (ret) if (ret)
goto out_free_gpio_irq; goto out_disable_clks_free_qpio_irq;
/* ASM9260 don't have version reg */ /* ASM9260 don't have version reg */
if (is_asm9260_auart(s)) { if (is_asm9260_auart(s)) {
@ -1735,7 +1735,11 @@ static int mxs_auart_probe(struct platform_device *pdev)
return 0; return 0;
out_free_gpio_irq: out_disable_clks_free_qpio_irq:
if (s->clk)
clk_disable_unprepare(s->clk_ahb);
if (s->clk_ahb)
clk_disable_unprepare(s->clk_ahb);
mxs_auart_free_gpio_irq(s); mxs_auart_free_gpio_irq(s);
auart_port[pdev->id] = NULL; auart_port[pdev->id] = NULL;
return ret; return ret;