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

[~andy/linux] / drivers / clk / keystone / gate.c

diff --git a/drivers/clk/keystone/gate.c b/drivers/clk/keystone/gate.c
index 1f333bcfc22e2ebdb344103a2aaad3f486fbec7d..86f1e362eafb8e29c02fae393620d39d32278529 100644 (file)
--- a/drivers/clk/keystone/gate.c
+++ b/drivers/clk/keystone/gate.c
@@ -179,6 +179,7 @@ static struct clk *clk_register_psc(struct device *dev,
 
        init.name = name;
        init.ops = &clk_psc_ops;
+       init.flags = 0;
        init.parent_names = (parent_name ? &parent_name : NULL);
        init.num_parents = (parent_name ? 1 : 0);
 
@@ -223,8 +224,7 @@ static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock)
        data->domain_base = of_iomap(node, i);
        if (!data->domain_base) {
                pr_err("%s: domain ioremap failed\n", __func__);
-               iounmap(data->control_base);
-               goto out;
+               goto unmap_ctrl;
        }
 
        of_property_read_u32(node, "domain-id", &data->domain_id);
@@ -237,16 +237,21 @@ static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock)
        parent_name = of_clk_get_parent_name(node, 0);
        if (!parent_name) {
                pr_err("%s: Parent clock not found\n", __func__);
-               goto out;
+               goto unmap_domain;
        }
 
        clk = clk_register_psc(NULL, clk_name, parent_name, data, lock);
-       if (clk) {
+       if (!IS_ERR(clk)) {
                of_clk_add_provider(node, of_clk_src_simple_get, clk);
                return;
        }
 
        pr_err("%s: error registering clk %s\n", __func__, node->name);
+
+unmap_domain:
+       iounmap(data->domain_base);
+unmap_ctrl:
+       iounmap(data->control_base);
 out:
        kfree(data);
        return;