summaryrefslogtreecommitdiff
path: root/drivers/tty/serial/mxs-auart.c
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-17 04:13:46 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-22 12:45:08 +0300
commit1664bc40d31403a755fe88307410ed858fe2c6c9 (patch)
treef4e4cb8a04948699beca7b4562c12aa0d4348e16 /drivers/tty/serial/mxs-auart.c
parentfadb4244085cd04fd9c8b3a4b3bc161f506431f3 (diff)
downloadlinux-1664bc40d31403a755fe88307410ed858fe2c6c9.tar.xz
serial: mxs-auart: Fix missing clk_disable_unprepare() on error in mxs_get_clks()
Commit 5d7519dfc963 ("serial: mxs-auart: Disable clock on error path") try to disable clock on error path, but still missing the clk_set_rate() error handling path. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/mxs-auart.c')
-rw-r--r--drivers/tty/serial/mxs-auart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index ec0ab33efd9d..770454e0dfa3 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -1534,7 +1534,7 @@ static int mxs_get_clks(struct mxs_auart_port *s,
err = clk_set_rate(s->clk, clk_get_rate(s->clk_ahb));
if (err) {
dev_err(s->dev, "Failed to set rate!\n");
- return err;
+ goto disable_clk_ahb;
}
err = clk_prepare_enable(s->clk);