w1: mxc_w1: Check the clk_prepare_enable() return value

[~andy/linux] / drivers / w1 / masters / mxc_w1.c

diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 953168c633924c82fea37b8cfb7176fdf4cccc7d..1e5d94c5afc9668af993bacbdcc2ea8a6e1de497 100644 (file)
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -108,7 +108,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
        unsigned long clkrate;
        struct resource *res;
        unsigned int clkdiv;
-       int err = 0;
+       int err;
 
        mdev = devm_kzalloc(&pdev->dev, sizeof(struct mxc_w1_device),
                            GFP_KERNEL);
@@ -135,20 +135,23 @@ static int mxc_w1_probe(struct platform_device *pdev)
        if (IS_ERR(mdev->regs))
                return PTR_ERR(mdev->regs);
 
-       clk_prepare_enable(mdev->clk);
+       err = clk_prepare_enable(mdev->clk);
+       if (err)
+               return err;
+
        __raw_writeb(clkdiv - 1, mdev->regs + MXC_W1_TIME_DIVIDER);
 
        mdev->bus_master.data = mdev;
        mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus;
        mdev->bus_master.touch_bit = mxc_w1_ds2_touch_bit;
 
-       err = w1_add_master_device(&mdev->bus_master);
+       platform_set_drvdata(pdev, mdev);
 
+       err = w1_add_master_device(&mdev->bus_master);
        if (err)
-               return err;
+               clk_disable_unprepare(mdev->clk);
 
-       platform_set_drvdata(pdev, mdev);
-       return 0;
+       return err;
 }
 
 /*