diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-09-21 14:00:04 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-21 09:02:23 -0700 |
commit | b0ba76785eef21ecfa3bcd2f6358f9cebbd8a9db (patch) | |
tree | 7ec359d93907a385ad6d7fc196e6730b5826c13a /drivers/staging/tidspbridge | |
parent | a00979cccb9cc9727b8357f8fdf1c1924c9b73ef (diff) | |
download | op-kernel-dev-b0ba76785eef21ecfa3bcd2f6358f9cebbd8a9db.zip op-kernel-dev-b0ba76785eef21ecfa3bcd2f6358f9cebbd8a9db.tar.gz |
staging: tidspbridge: fix return value check in dsp_wdt_init()
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>
Diffstat (limited to 'drivers/staging/tidspbridge')
-rw-r--r-- | drivers/staging/tidspbridge/core/wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c index 1ed1474..e5adad0 100644 --- a/drivers/staging/tidspbridge/core/wdt.c +++ b/drivers/staging/tidspbridge/core/wdt.c @@ -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; |