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

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
...@@ -525,8 +525,6 @@ static int mlb_usio_probe(struct platform_device *pdev) ...@@ -525,8 +525,6 @@ static int mlb_usio_probe(struct platform_device *pdev)
ret = -ENODEV; ret = -ENODEV;
goto failed; goto failed;
} }
port->mapbase = res->start;
port->membase = ioremap(res->start, (res->end - res->start + 1));
port->membase = devm_ioremap(&pdev->dev, res->start, port->membase = devm_ioremap(&pdev->dev, res->start,
resource_size(res)); resource_size(res));
...@@ -548,16 +546,12 @@ static int mlb_usio_probe(struct platform_device *pdev) ...@@ -548,16 +546,12 @@ static int mlb_usio_probe(struct platform_device *pdev)
ret = uart_add_one_port(&mlb_usio_uart_driver, port); ret = uart_add_one_port(&mlb_usio_uart_driver, port);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Adding port failed: %d\n", ret); dev_err(&pdev->dev, "Adding port failed: %d\n", ret);
goto failed1; goto failed;
} }
return 0; return 0;
failed1:
iounmap(port->membase);
failed: failed:
clk_disable_unprepare(clk); clk_disable_unprepare(clk);
clk_put(clk);
return ret; return ret;
} }
...@@ -569,7 +563,6 @@ static int mlb_usio_remove(struct platform_device *pdev) ...@@ -569,7 +563,6 @@ static int mlb_usio_remove(struct platform_device *pdev)
uart_remove_one_port(&mlb_usio_uart_driver, port); uart_remove_one_port(&mlb_usio_uart_driver, port);
clk_disable_unprepare(clk); clk_disable_unprepare(clk);
clk_put(clk);
return 0; return 0;
} }
......
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