diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-29 11:24:39 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-29 11:24:39 -0800 | 
| commit | c5f2ac92c69c64ea303a7b28b17143fbf601182d (patch) | |
| tree | 638fb1efb0c14b53876e2002ece72acc1494a311 /arch/arm/mach-omap2/pm.c | |
| parent | 88ebdda6159ffc15699f204c33feb3e431bf9bdc (diff) | |
| parent | f2273ecd9a7405b867522ce03d31a9fee80c2495 (diff) | |
| download | olio-linux-3.10-c5f2ac92c69c64ea303a7b28b17143fbf601182d.tar.xz olio-linux-3.10-c5f2ac92c69c64ea303a7b28b17143fbf601182d.zip  | |
Merge tag 'fixes-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Arnd Bergmann says:
 "Another set of arm-soc bug fixes on top of v3.3-rc5.  The few larger
  bits are all for devices that still need to get set up in board code.
  Only three platforms are in this set of fixes: omap2+, pxa and lpc32xx."
* tag 'fixes-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (22 commits)
  ARM: LPC32xx: serial.c: Fixed loop limit
  ARM: LPC32xx: serial.c: HW bug workaround
  ARM: LPC32xx: irq.c: Clear latched event
  ARM: LPC32xx: Fix interrupt controller init
  ARM: LPC32xx: Fix irq on GPI_28
  ARM: OMAP2: fix mailbox init code
  ARM: OMAP2+: gpmc-smsc911x: add required smsc911x regulators
  ARM: OMAP1: Fix out-of-bounds array access for Innovator
  OMAP3 EVM: remove out-of-bounds array access of gpio_leds
  ARM: OMAP: Fix build error when mmc_omap is built as module
  ARM: OMAP: Fix kernel panic with HSMMC when twl4030_gpio is a module
  pxa/hx4700: add platform device and I2C info for AK4641 codec
  arch/arm/mach-pxa/: included linux/gpio.h twice
  arch/arm/mach-mmp/: some files include some headers twice
  ARM: pxa: fix error handling in pxa2xx_drv_pcmcia_probe
  ARM: pxa: fix including linux/gpio.h twice
  ARM: pxa: fix mixed declarations and code in sharpsl_pm
  ARM: pxa: fix wrong parsing gpio event on spitz
  ARM: OMAP2+: usb-host: fix compile warning
  ARM: OMAP4: Move the barrier memboclk_steal() as part of reserve callback
  ...
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 3 | 
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 1881fe91514..5a65dd04aa3 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -174,14 +174,17 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,  	freq = clk->rate;  	clk_put(clk); +	rcu_read_lock();  	opp = opp_find_freq_ceil(dev, &freq);  	if (IS_ERR(opp)) { +		rcu_read_unlock();  		pr_err("%s: unable to find boot up OPP for vdd_%s\n",  			__func__, vdd_name);  		goto exit;  	}  	bootup_volt = opp_get_voltage(opp); +	rcu_read_unlock();  	if (!bootup_volt) {  		pr_err("%s: unable to find voltage corresponding "  			"to the bootup OPP for vdd_%s\n", __func__, vdd_name);  |