diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-01-30 17:03:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-01-30 17:03:05 -0500 |
| commit | 0e084c9c843320995b0e219f02880f910d439b37 (patch) | |
| tree | fe541c1d636f9666104f7753d0435c4681685ef9 /arch/arm/mach-omap2/cminst44xx.c | |
| parent | 7b4bc07991564dfcdfd9e6e7cbebc9bf337111eb (diff) | |
| parent | 562e54d13b6e0b17f72c9e629e1fd0b71e2a8a36 (diff) | |
Merge tag 'omap-cleanup-b-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm
Several OMAP2+ power management fixes, optimizations, and cleanup.
This series is a prerequisite for the functional powerdomain
conversion series.
Basic test logs for this branch are here:
http://www.pwsan.com/omap/testlogs/pm_cleanup_fixes_3.9/20130129150017/
Diffstat (limited to 'arch/arm/mach-omap2/cminst44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cminst44xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 7f9a464f01e9..f0290f5566fe 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c | |||
| @@ -393,7 +393,7 @@ static int omap4_clkdm_clear_all_wkup_sleep_deps(struct clockdomain *clkdm) | |||
| 393 | continue; /* only happens if data is erroneous */ | 393 | continue; /* only happens if data is erroneous */ |
| 394 | 394 | ||
| 395 | mask |= 1 << cd->clkdm->dep_bit; | 395 | mask |= 1 << cd->clkdm->dep_bit; |
| 396 | atomic_set(&cd->wkdep_usecount, 0); | 396 | cd->wkdep_usecount = 0; |
| 397 | } | 397 | } |
| 398 | 398 | ||
| 399 | omap4_cminst_clear_inst_reg_bits(mask, clkdm->prcm_partition, | 399 | omap4_cminst_clear_inst_reg_bits(mask, clkdm->prcm_partition, |