diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-12 03:07:40 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-12 03:07:40 -0400 |
| commit | f3f8290cb3fa4aa627321530bb85d5f35e487433 (patch) | |
| tree | f7ceae8076ff77ae69622495c3ab081ff1f8e363 | |
| parent | 0dae89572cbcd5f676ea52a9448d9639d97a53d6 (diff) | |
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>
| -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 34707b86776..9e1fc133a47 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) | |||
| 399 | int idno; | 399 | int idno; |
| 400 | 400 | ||
| 401 | clk = clk_get_sys(dev_id, id); | 401 | clk = clk_get_sys(dev_id, id); |
| 402 | if (clk) | 402 | if (clk && !IS_ERR(clk)) |
| 403 | return clk; | 403 | return clk; |
| 404 | 404 | ||
| 405 | if (dev == NULL || dev->bus != &platform_bus_type) | 405 | if (dev == NULL || dev->bus != &platform_bus_type) |