diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-05 14:25:35 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-05 14:25:35 -0800 |
| commit | bb887688bccb48d94fa873f0f6cc7e7e3e4dc05e (patch) | |
| tree | 2c848a1cbb0215cbe07552f78d5c78b970a91d4d /arch/arm/mach-omap2/smartreflex-class3.c | |
| parent | 149f1d5c8d2fd6879cdf93ca70f1cb745e698a1e (diff) | |
| parent | 63371faf9198302c7ebd41e7fbe78eb6b57bba86 (diff) | |
Merge branch 'for_3.4/cleanup/sr' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into sr
Diffstat (limited to 'arch/arm/mach-omap2/smartreflex-class3.c')
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex-class3.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/smartreflex-class3.c b/arch/arm/mach-omap2/smartreflex-class3.c index 53d9d0a5b39..955566eefac 100644 --- a/arch/arm/mach-omap2/smartreflex-class3.c +++ b/arch/arm/mach-omap2/smartreflex-class3.c @@ -29,6 +29,7 @@ static int sr_class3_enable(struct voltagedomain *voltdm) static int sr_class3_disable(struct voltagedomain *voltdm, int is_volt_reset) { + sr_disable_errgen(voltdm); omap_vp_disable(voltdm); sr_disable(voltdm); if (is_volt_reset) |