Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-kernels.git] / drivers / clk / sunxi / clk-sunxi.c

diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 6d25e4e9dfec07755648774fd2e7fef19aa1c63d..abf7b37faf73f3dd2366024a5bb97affc152cda2 100644 (file)
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -198,6 +198,8 @@ static void __init sun6i_ahb1_clk_setup(struct device_node *node)
        int i = 0;
 
        reg = of_io_request_and_map(node, 0, of_node_full_name(node));
+       if (IS_ERR(reg))
+               return;
 
        /* we have a mux, we will have >1 parents */
        while (i < SUN6I_AHB1_MAX_PARENTS &&