diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:09:31 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:09:31 -0700 |
| commit | 6ab019b62e0505289b26bd00d997dc7686192fa4 (patch) | |
| tree | 2d632c9abf841795f691a5a743d48dac1e165c90 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 580a7ce8fb5012c0c0afe592bdafd482a3679911 (diff) | |
| parent | 8a94febc21743fe121bdaf1d1470d98b1135acc2 (diff) | |
Merge tag 'omap-fixes-a-for-3.6rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes
Some hwmod, clockdomain, am335x fixes against v3.6-rc4.
Test logs can be found here:
http://www.pwsan.com/omap/testlogs/omap_fixes_a_3.6rc/20120904110254/
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 6ca8e519968d..37afbd173c2c 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -1889,6 +1889,7 @@ static int _enable(struct omap_hwmod *oh) _enable_sysc(oh); } } else { + _omap4_disable_module(oh); _disable_clocks(oh); pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n", oh->name, r); |