OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel...
[uclinux-h8/linux.git]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod.c
b/arch/arm/mach-omap2/omap_hwmod.c
index
80b7359
..
3615e0d
100644
(file)
--- 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);