Merge branch 'work.mount3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / drivers / clk / clk-bulk.c

diff --git a/drivers/clk/clk-bulk.c b/drivers/clk/clk-bulk.c
index 524bf9a53098576e00d2f43edfc6d5d25cf8e8e2..e9e16425c739c4ac9c7368e3cb44dfabc8bab027 100644 (file)
--- a/drivers/clk/clk-bulk.c
+++ b/drivers/clk/clk-bulk.c
@@ -18,10 +18,13 @@ static int __must_check of_clk_bulk_get(struct device_node *np, int num_clks,
        int ret;
        int i;
 
-       for (i = 0; i < num_clks; i++)
+       for (i = 0; i < num_clks; i++) {
+               clks[i].id = NULL;
                clks[i].clk = NULL;
+       }
 
        for (i = 0; i < num_clks; i++) {
+               of_property_read_string_index(np, "clock-names", i, &clks[i].id);
                clks[i].clk = of_clk_get(np, i);
                if (IS_ERR(clks[i].clk)) {
                        ret = PTR_ERR(clks[i].clk);