|
@@ -112,6 +112,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,
|
|
@@ -125,12 +129,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);
|
|
@@ -146,8 +148,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;
|
|
|
}
|
|
|
|