diff options
| author |   Tero Kristo <t-kristo@ti.com> | 2013-07-12 12:26:41 +0300 |
|---|---|---|
| committer |   Mike Turquette <mturquette@linaro.org> | 2014-01-17 12:37:03 -0800 |
| commit | 924f9498acb004d8cb704a008f1060fad604ccca (patch) | |
| tree | 5e3bc623bcda1111662262144d59fb6d028ce8f7 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | ARM: OMAP2+: clock: use driver API instead of direct memory read/write (diff) | |
| download | linux-dev-924f9498acb004d8cb704a008f1060fad604ccca.tar.xz linux-dev-924f9498acb004d8cb704a008f1060fad604ccca.zip | |
ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm
If the main clock for a hwmod is of basic clock type, it is illegal to type
cast this to clk_hw_omap and will result in bogus data. Fixed by checking
the clock flags before attempting the type cast.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 8a1b5e0bad40..cc24c95b77e5 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -686,6 +686,8 @@ static struct clockdomain *_get_clkdm(struct omap_hwmod *oh) if (oh->clkdm) { return oh->clkdm; } else if (oh->_clk) { + if (__clk_get_flags(oh->_clk) & CLK_IS_BASIC) + return NULL; clk = to_clk_hw_omap(__clk_get_hw(oh->_clk)); return clk->clkdm; } |