Merge branch 'fixes-rc1' into omap-for-v4.2/fixes

[cascardo/linux.git] / drivers / clk / socfpga / clk-periph.c

diff --git a/drivers/clk/socfpga/clk-periph.c b/drivers/clk/socfpga/clk-periph.c
index 46531c3..83aeaa2 100644 (file)
--- a/drivers/clk/socfpga/clk-periph.c
+++ b/drivers/clk/socfpga/clk-periph.c
@@ -76,7 +76,7 @@ static __init void __socfpga_periph_init(struct device_node *node,
                periph_clk->shift = div_reg[1];
                periph_clk->width = div_reg[2];
        } else {
-               periph_clk->div_reg = 0;
+               periph_clk->div_reg = NULL;
        }
 
        rc = of_property_read_u32(node, "fixed-divider", &fixed_div);