diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:27:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:27:54 +0100 |
| commit | 06fb76d5e4d7bec871fc9f492da130b3a94b9952 (patch) | |
| tree | 085c449931f6e54f5ff52070f1a8fb458db71be9 /drivers/w1/masters/mxc_w1.c | |
| parent | 90eeaee38cbacc20a6cfd14d07273f22078b8898 (diff) | |
| parent | 8900747f49c2a7f38239abe710de4a1d1d275591 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-androidlsk-v4.9-18.06-android
Diffstat (limited to 'drivers/w1/masters/mxc_w1.c')
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index a4621757a47f..dacb5919970c 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -113,6 +113,10 @@ static int mxc_w1_probe(struct platform_device *pdev) if (IS_ERR(mdev->clk)) return PTR_ERR(mdev->clk); + err = clk_prepare_enable(mdev->clk); + if (err) + return err; + clkrate = clk_get_rate(mdev->clk); if (clkrate < 10000000) dev_warn(&pdev->dev, @@ -126,12 +130,10 @@ static int mxc_w1_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mdev->regs = devm_ioremap_resource(&pdev->dev, res); - if (IS_ERR(mdev->regs)) - return PTR_ERR(mdev->regs); - - err = clk_prepare_enable(mdev->clk); - if (err) - return err; + if (IS_ERR(mdev->regs)) { + err = PTR_ERR(mdev->regs); + goto out_disable_clk; + } /* Software reset 1-Wire module */ writeb(MXC_W1_RESET_RST, mdev->regs + MXC_W1_RESET); @@ -147,8 +149,12 @@ static int mxc_w1_probe(struct platform_device *pdev) err = w1_add_master_device(&mdev->bus_master); if (err) - clk_disable_unprepare(mdev->clk); + goto out_disable_clk; + return 0; + +out_disable_clk: + clk_disable_unprepare(mdev->clk); return err; } |