aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2006-04-09 22:21:05 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-04-09 22:21:05 +0100
commit67d4d8352b5a78df422a956657d9be4b860680ab (patch)
tree0c94bd81ccb9a1e0313382efc81ffe159d192484 /arch
parent50e5629aa956c8c82015c90554a9a3fbf54cb404 (diff)
downloadkernel_samsung_tuna-67d4d8352b5a78df422a956657d9be4b860680ab.zip
kernel_samsung_tuna-67d4d8352b5a78df422a956657d9be4b860680ab.tar.gz
kernel_samsung_tuna-67d4d8352b5a78df422a956657d9be4b860680ab.tar.bz2
[ARM] 3461/1: ARM: OMAP: Fix clk_get() when using id and name
Patch from Tony Lindgren Recent change to use both id and name when available was not necessarily returning the right clock as it also searched for clock name afterwards. This caused MMC to break on H2 and H3 boards. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-omap/clock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 06485c1..32ec04c 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -58,7 +58,7 @@ struct clk * clk_get(struct device *dev, const char *id)
if (p->id == idno &&
strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
clk = p;
- break;
+ goto found;
}
}
@@ -69,6 +69,7 @@ struct clk * clk_get(struct device *dev, const char *id)
}
}
+found:
mutex_unlock(&clocks_mutex);
return clk;