diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-26 18:33:51 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-26 18:33:51 -0800 |
| commit | 5ba8dac012c33b336b29d472fdf5296b5682d8bf (patch) | |
| tree | 0bb9a10b248700f2aabd97f52ee336a6681c1b1e | |
| parent | 7e50e7e176634e8cc0335778915be75df41043dc (diff) | |
| parent | f63fcc90a379a269a07a1111f5b7ba28ebcb1eb4 (diff) | |
Merge branch 'clk-fixes' into clk-next
| -rw-r--r-- | drivers/clk/at91/clk-master.c | 2 | ||||
| -rw-r--r-- | drivers/clk/clk-nomadik.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c index bd313f7816a8..c1af80bcdf20 100644 --- a/drivers/clk/at91/clk-master.c +++ b/drivers/clk/at91/clk-master.c @@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc, irq = irq_of_parse_and_map(np, 0); if (!irq) - return; + goto out_free_characteristics; clk = at91_clk_register_master(pmc, irq, name, num_parents, parent_names, layout, diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c index 6a934a5296bd..05e04ce0f148 100644 --- a/drivers/clk/clk-nomadik.c +++ b/drivers/clk/clk-nomadik.c @@ -494,6 +494,9 @@ static const struct file_operations nomadik_src_clk_debugfs_ops = { static int __init nomadik_src_clk_init_debugfs(void) { + /* Vital for multiplatform */ + if (!src_base) + return -ENODEV; src_pcksr0_boot = readl(src_base + SRC_PCKSR0); src_pcksr1_boot = readl(src_base + SRC_PCKSR1); debugfs_create_file("nomadik-src-clk", S_IFREG | S_IRUGO, |