From: Paul Mundt Date: Tue, 12 May 2009 07:07:40 +0000 (+0900) Subject: sh: clkfwk: Handle clk_get_sys() returning an ERR_PTR. X-Git-Tag: v2.6.31-rc1~392^2~41^2~17 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f3f8290cb3fa4aa627321530bb85d5f35e487433;p=~emulex%2Finfiniband.git 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 --- 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) 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)