Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[karo-tx-linux.git] / drivers / clk / sunxi-ng / ccu_common.c

diff --git a/drivers/clk/sunxi-ng/ccu_common.c b/drivers/clk/sunxi-ng/ccu_common.c
index 51d4bac97ab301f9d0213ff40327325622fd2109..8a47bafd78905bce849235d791f1469d448afcc9 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_common.c
+++ b/drivers/clk/sunxi-ng/ccu_common.c
@@ -25,13 +25,18 @@ static DEFINE_SPINLOCK(ccu_lock);
 
 void ccu_helper_wait_for_lock(struct ccu_common *common, u32 lock)
 {
+       void __iomem *addr;
        u32 reg;
 
        if (!lock)
                return;
 
-       WARN_ON(readl_relaxed_poll_timeout(common->base + common->reg, reg,
-                                          reg & lock, 100, 70000));
+       if (common->features & CCU_FEATURE_LOCK_REG)
+               addr = common->base + common->lock_reg;
+       else
+               addr = common->base + common->reg;
+
+       WARN_ON(readl_relaxed_poll_timeout(addr, reg, reg & lock, 100, 70000));
 }
 
 int sunxi_ccu_probe(struct device_node *node, void __iomem *reg,
@@ -70,6 +75,11 @@ int sunxi_ccu_probe(struct device_node *node, void __iomem *reg,
                goto err_clk_unreg;
 
        reset = kzalloc(sizeof(*reset), GFP_KERNEL);
+       if (!reset) {
+               ret = -ENOMEM;
+               goto err_alloc_reset;
+       }
+
        reset->rcdev.of_node = node;
        reset->rcdev.ops = &ccu_reset_ops;
        reset->rcdev.owner = THIS_MODULE;
@@ -85,6 +95,16 @@ int sunxi_ccu_probe(struct device_node *node, void __iomem *reg,
        return 0;
 
 err_of_clk_unreg:
+       kfree(reset);
+err_alloc_reset:
+       of_clk_del_provider(node);
 err_clk_unreg:
+       while (--i >= 0) {
+               struct clk_hw *hw = desc->hw_clks->hws[i];
+
+               if (!hw)
+                       continue;
+               clk_hw_unregister(hw);
+       }
        return ret;
 }