Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c305539 authored by Branislav Radocaj's avatar Branislav Radocaj Committed by Greg Kroah-Hartman
Browse files

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: default avatarBranislav Radocaj <branislav@radocaj.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a28fd2b

drivers/tty/serial/mxs-auart.c

+6 −2
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ static int mxs_auart_probe(struct platform_device *pdev) 


	ret = uart_add_one_port(&auart_driver, &s->port);

	if (ret)

		goto out_free_gpio_irq;

		goto out_disable_clks_free_qpio_irq;



	/* ASM9260 don't have version reg */

	if (is_asm9260_auart(s)) {
@@ -1735,7 +1735,11 @@ static int mxs_auart_probe(struct platform_device *pdev) 


	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);

	auart_port[pdev->id] = NULL;

	return ret;