Merge branch 'next-queue' into next

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / clkt_clksel.c

diff --git a/arch/arm/mach-omap2/clkt_clksel.c b/arch/arm/mach-omap2/clkt_clksel.c
index a781cd6795a4b95ea668c8a753bda7406e4128f3..e25364de028a8ba7a1eb0f418177d7cdb7dee4d6 100644 (file)
--- a/arch/arm/mach-omap2/clkt_clksel.c
+++ b/arch/arm/mach-omap2/clkt_clksel.c
@@ -97,7 +97,7 @@ static u8 _get_div_and_fieldval(struct clk *src_clk, struct clk *clk,
                                u32 *field_val)
 {
        const struct clksel *clks;
-       const struct clksel_rate *clkr, *max_clkr;
+       const struct clksel_rate *clkr, *max_clkr = NULL;
        u8 max_div = 0;
 
        clks = _get_clksel_by_parent(clk, src_clk);