diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-09-24 14:42:13 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-24 14:42:13 -0400 |
| commit | 3fe05bd9980df7207a35b4841a94dc2875e86960 (patch) | |
| tree | b5bb9287088955d2b4b4552b4a4ca9c4c40769a4 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 6bfc82ff589a00e5fbc12b958c649d703d273c86 (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
Merge tag 'v3.6-rc6' into devel-dt
Linux 3.6-rc6
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 4c6b5a774054..4a810f6c4c04 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) | |||
| 1889 | _enable_sysc(oh); | 1889 | _enable_sysc(oh); |
| 1890 | } | 1890 | } |
| 1891 | } else { | 1891 | } else { |
| 1892 | _omap4_disable_module(oh); | ||
| 1892 | _disable_clocks(oh); | 1893 | _disable_clocks(oh); |
| 1893 | pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n", | 1894 | pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n", |
| 1894 | oh->name, r); | 1895 | oh->name, r); |