From: Tony Lindgren <tony@atomide.com>
Date: Tue, 3 Apr 2012 18:31:38 +0000 (-0700)
Subject: Merge branch 'for_3.4/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~17050^2~4^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=08956f1c5883f66c2e547f8137061c6b58ccbb53;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for_3.4/fixes/pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes
---

08956f1c5883f66c2e547f8137061c6b58ccbb53
diff --cc arch/arm/mach-omap2/pm34xx.c
index 238defc6f6df,6aeacf660790..703bd1099259
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@@ -739,11 -820,11 +737,11 @@@ static int __init omap3_pm_init(void
  
  	ret = pwrdm_for_each(pwrdms_setup, NULL);
  	if (ret) {
- 		printk(KERN_ERR "Failed to setup powerdomains\n");
- 		goto err2;
+ 		pr_err("Failed to setup powerdomains\n");
+ 		goto err3;
  	}
  
 -	(void) clkdm_for_each(clkdms_setup, NULL);
 +	(void) clkdm_for_each(omap_pm_clkdms_setup, NULL);
  
  	mpu_pwrdm = pwrdm_lookup("mpu_pwrdm");
  	if (mpu_pwrdm == NULL) {