diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
| commit | 69f658e399f3d9cb9c9680afb714ba23860d7ccb (patch) | |
| tree | 13fbc42f466cb10d319514e4ddec53def8c554f6 /drivers/tty/serial/sccnxp.c | |
| parent | 9867999f3a85b52f96ef05fca00cc8128eed01ce (diff) | |
| parent | 42f6284ae602469762ee721ec31ddfc6170e00bc (diff) | |
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'drivers/tty/serial/sccnxp.c')
| -rw-r--r-- | drivers/tty/serial/sccnxp.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index cdd2f942317c..b9c7a904c1ea 100644 --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c @@ -889,7 +889,16 @@ static int sccnxp_probe(struct platform_device *pdev) goto err_out; uartclk = 0; } else { - clk_prepare_enable(clk); + ret = clk_prepare_enable(clk); + if (ret) + goto err_out; + + ret = devm_add_action_or_reset(&pdev->dev, + (void(*)(void *))clk_disable_unprepare, + clk); + if (ret) + goto err_out; + uartclk = clk_get_rate(clk); } @@ -988,7 +997,7 @@ static int sccnxp_probe(struct platform_device *pdev) uart_unregister_driver(&s->uart); err_out: if (!IS_ERR(s->regulator)) - return regulator_disable(s->regulator); + regulator_disable(s->regulator); return ret; } |