diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 13:06:05 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 14:13:11 +0400 |
commit | 17bffc78438d010c3e57ad5c1956e3ab50be423a (patch) | |
tree | b69583a61ba780be64ce806c208bc170ff44fa4f /drivers/clk/spear/clk-vco-pll.c | |
parent | f86804af89686562fdeeabbdc0dfc6db9397f202 (diff) | |
parent | bcd6f569e87471d7f104bd9497f0b516a3b12e32 (diff) | |
download | linux-17bffc78438d010c3e57ad5c1956e3ab50be423a.tar.xz |
Merge branch 'depends/clk' into next/soc
From Mike Turquette:
* depends/clk:
clk: Common clocks implementation for Versatile Express
clk: Versatile Express clock generators ("osc") driver
CLK: clk-twl6040: Initial clock driver for OMAP4+ McPDM fclk clock
clk: fix return value check in sirfsoc_of_clk_init()
clk: fix return value check in of_fixed_clk_setup()
clk: ux500: Update sdmmc clock to 100MHz for u8500
clk: ux500: Support prcmu ape opp voltage clock
mfd: dbx500: Export prmcu_request_ape_opp_100_voltage
clk: Don't return negative numbers for unsigned values with !clk
clk: Fix documentation typos
clk: Document .is_enabled op
clk: SPEAr: Vco-pll: Fix compilation warning
Diffstat (limited to 'drivers/clk/spear/clk-vco-pll.c')
-rw-r--r-- | drivers/clk/spear/clk-vco-pll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/spear/clk-vco-pll.c b/drivers/clk/spear/clk-vco-pll.c index 5f1b6badeb15..1b9b65bca51e 100644 --- a/drivers/clk/spear/clk-vco-pll.c +++ b/drivers/clk/spear/clk-vco-pll.c @@ -147,7 +147,7 @@ static int clk_pll_set_rate(struct clk_hw *hw, unsigned long drate, struct clk_pll *pll = to_clk_pll(hw); struct pll_rate_tbl *rtbl = pll->vco->rtbl; unsigned long flags = 0, val; - int i; + int uninitialized_var(i); clk_pll_round_rate_index(hw, drate, NULL, &i); |