From 5a8ea4c8863ab75696ac5650c65b41f1637e91bd Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 18 Jul 2011 16:24:17 -0700 Subject: [PATCH] --- yaml --- r: 272757 b: refs/heads/master c: 6a62b78d9aa6661cae1a7d30b574daf435a14c47 h: refs/heads/master i: 272755: eaa8ad1c2c9ab31a51a48e92545eee4d2a3eaec7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/vc.c | 2 -- trunk/arch/arm/mach-omap2/voltage.c | 6 +++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 80a16e241d6d..c666e947a2b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5c128289f5066a7c6bf27d6ba27a6ae425be757 +refs/heads/master: 6a62b78d9aa6661cae1a7d30b574daf435a14c47 diff --git a/trunk/arch/arm/mach-omap2/vc.c b/trunk/arch/arm/mach-omap2/vc.c index d9e69944f0c9..6e586767a904 100644 --- a/trunk/arch/arm/mach-omap2/vc.c +++ b/trunk/arch/arm/mach-omap2/vc.c @@ -152,8 +152,6 @@ void omap_vc_post_scale(struct voltagedomain *voltdm, smps_delay = ((smps_steps * voltdm->pmic->step_size) / voltdm->pmic->slew_rate) + 2; udelay(smps_delay); - - voltdm->nominal_volt = target_volt; } /* vc_bypass_scale - VC bypass method of voltage scaling */ diff --git a/trunk/arch/arm/mach-omap2/voltage.c b/trunk/arch/arm/mach-omap2/voltage.c index 441c2d98008c..64070ac1e761 100644 --- a/trunk/arch/arm/mach-omap2/voltage.c +++ b/trunk/arch/arm/mach-omap2/voltage.c @@ -85,7 +85,11 @@ int voltdm_scale(struct voltagedomain *voltdm, return -ENODATA; } - return voltdm->scale(voltdm, target_volt); + ret = voltdm->scale(voltdm, target_volt); + if (!ret) + voltdm->nominal_volt = target_volt; + + return ret; } /**