diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-08 18:57:41 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-08 18:57:41 -0400 |
| commit | fce680e9faaa8acc0ab0a931c5fa823b581cbab0 (patch) | |
| tree | c96026ec637128c21c665a733db5594ebebbb5a4 /arch/arm/mach-omap2/pm.c | |
| parent | 5e090ed7af10729a396a25df43d69a236e789736 (diff) | |
| parent | ce3810cdb4ca31238c87e095d2c494a5eaa4f65d (diff) | |
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm
OMAP PM related fixes for v3.7-rc
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index abefbc4d8e0b..1e40afe7ed3c 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
| @@ -177,7 +177,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, | |||
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | voltdm = voltdm_lookup(vdd_name); | 179 | voltdm = voltdm_lookup(vdd_name); |
| 180 | if (IS_ERR(voltdm)) { | 180 | if (!voltdm) { |
| 181 | pr_err("%s: unable to get vdd pointer for vdd_%s\n", | 181 | pr_err("%s: unable to get vdd pointer for vdd_%s\n", |
| 182 | __func__, vdd_name); | 182 | __func__, vdd_name); |
| 183 | goto exit; | 183 | goto exit; |