diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-23 16:16:29 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-23 16:16:29 -0700 |
| commit | a34a3b7264fdb40c8d4be8bebb38fd56dc48d162 (patch) | |
| tree | d8625985d600c8fb5ef8b5312e0f13a84af3435b /arch/arm/plat-omap | |
| parent | e23d7096f9633d37aa35dffab9b0bd594ed64533 (diff) | |
| parent | dc57aef503859dbf724f6126c58b2e1672e215f3 (diff) | |
| download | op-kernel-dev-a34a3b7264fdb40c8d4be8bebb38fd56dc48d162.zip op-kernel-dev-a34a3b7264fdb40c8d4be8bebb38fd56dc48d162.tar.gz | |
Merge tag 'omap-fixes-a-for-3.5rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes
From Paul Walmsley (as per Tony Lindgren's request):
"Some uncontroversial OMAP clock, hwmod, and compiler warning fixes for 3.5-rc"
* tag 'omap-fixes-a-for-3.5rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled
ARM: OMAP2+: mux: fix sparse warning
ARM: OMAP2+: CM: increase the module disable timeout
ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks
ARM: OMAP4: hwmod data: fix 32k sync timer idle modes
ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby
ARM: OMAP: PM: Lock clocks list while generating summary
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/clock.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 62ec5c4..706b7e2 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c @@ -461,6 +461,7 @@ static int clk_dbg_show_summary(struct seq_file *s, void *unused) struct clk *c; struct clk *pa; + mutex_lock(&clocks_mutex); seq_printf(s, "%-30s %-30s %-10s %s\n", "clock-name", "parent-name", "rate", "use-count"); @@ -469,6 +470,7 @@ static int clk_dbg_show_summary(struct seq_file *s, void *unused) seq_printf(s, "%-30s %-30s %-10lu %d\n", c->name, pa ? pa->name : "none", c->rate, c->usecount); } + mutex_unlock(&clocks_mutex); return 0; } |
