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

Commit 74cdf8ce authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman
Browse files

serial: milbeaut_usio: Fix error handling in probe and remove 



devm_clk_get() is used so there is no reason to explicitly call
clk_put() in probe or remove functions. Also remove duplicate assign
for port->membase.

Fixes: ba44dc04 ("serial: Add Milbeaut serial control")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Tested-by: default avatarSugaya Taichi <sugaya.taichi@socionext.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ef79565

drivers/tty/serial/milbeaut_usio.c

+1 −8
Original line number Diff line number Diff line
@@ -525,8 +525,6 @@ static int mlb_usio_probe(struct platform_device *pdev) 
		ret = -ENODEV;

		goto failed;

	}

	port->mapbase = res->start;

	port->membase = ioremap(res->start, (res->end - res->start + 1));

	port->membase = devm_ioremap(&pdev->dev, res->start,

				resource_size(res));
@@ -548,16 +546,12 @@ static int mlb_usio_probe(struct platform_device *pdev) 
	ret = uart_add_one_port(&mlb_usio_uart_driver, port);

	if (ret) {

		dev_err(&pdev->dev, "Adding port failed: %d\n", ret);

		goto failed1;

		goto failed;

	}

	return 0;



failed1:

	iounmap(port->membase);



failed:

	clk_disable_unprepare(clk);

	clk_put(clk);



	return ret;

}
@@ -569,7 +563,6 @@ static int mlb_usio_remove(struct platform_device *pdev) 


	uart_remove_one_port(&mlb_usio_uart_driver, port);

	clk_disable_unprepare(clk);

	clk_put(clk);



	return 0;

}