diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-12 16:07:40 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-12 16:07:40 +0900 |
| commit | f3f8290cb3fa4aa627321530bb85d5f35e487433 (patch) | |
| tree | f7ceae8076ff77ae69622495c3ab081ff1f8e363 /arch/sh/kernel | |
| parent | 0dae89572cbcd5f676ea52a9448d9639d97a53d6 (diff) | |
| download | kernel_samsung_aries-f3f8290cb3fa4aa627321530bb85d5f35e487433.zip kernel_samsung_aries-f3f8290cb3fa4aa627321530bb85d5f35e487433.tar.gz kernel_samsung_aries-f3f8290cb3fa4aa627321530bb85d5f35e487433.tar.bz2 | |
sh: clkfwk: Handle clk_get_sys() returning an ERR_PTR.
clk_get() needs to also perform an IS_ERR() check to see whether
clk_get_sys() failed or not.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/cpu/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c index 34707b8..9e1fc13 100644 --- a/arch/sh/kernel/cpu/clock.c +++ b/arch/sh/kernel/cpu/clock.c @@ -399,7 +399,7 @@ struct clk *clk_get(struct device *dev, const char *id) int idno; clk = clk_get_sys(dev_id, id); - if (clk) + if (clk && !IS_ERR(clk)) return clk; if (dev == NULL || dev->bus != &platform_bus_type) |