staging: tidspbridge: fix return value check in dsp_wdt_init()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Fri, 21 Sep 2012 06:00:04 +0000 (14:00 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Sep 2012 16:02:23 +0000 (09:02 -0700)
In case of error, the function clk_get() returns ERR_PTR()
and never returns NULL pointer. The NULL test in the error
handling should be replaced with IS_ERR().

dpatch engine is used to auto generated this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/tidspbridge/core/wdt.c

index 1ed1474d0b564b78bbc500ef5ce963c1379ab0c4..e5adad08f1c4ffe3a9b5f90cf5fb1f9b7b590f34 100644 (file)
@@ -62,9 +62,9 @@ int dsp_wdt_init(void)
 
        dsp_wdt.fclk = clk_get(NULL, "wdt3_fck");
 
-       if (dsp_wdt.fclk) {
+       if (!IS_ERR(dsp_wdt.fclk)) {
                dsp_wdt.iclk = clk_get(NULL, "wdt3_ick");
-               if (!dsp_wdt.iclk) {
+               if (IS_ERR(dsp_wdt.iclk)) {
                        clk_put(dsp_wdt.fclk);
                        dsp_wdt.fclk = NULL;
                        ret = -EFAULT;