aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-21 02:00:04 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-21 12:02:23 -0400
commitb0ba76785eef21ecfa3bcd2f6358f9cebbd8a9db (patch)
tree7ec359d93907a385ad6d7fc196e6730b5826c13a
parenta00979cccb9cc9727b8357f8fdf1c1924c9b73ef (diff)
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>
-rw-r--r--drivers/staging/tidspbridge/core/wdt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c
index 1ed1474d0b5..e5adad08f1c 100644
--- a/drivers/staging/tidspbridge/core/wdt.c
+++ b/drivers/staging/tidspbridge/core/wdt.c
@@ -62,9 +62,9 @@ int dsp_wdt_init(void)
62 62
63 dsp_wdt.fclk = clk_get(NULL, "wdt3_fck"); 63 dsp_wdt.fclk = clk_get(NULL, "wdt3_fck");
64 64
65 if (dsp_wdt.fclk) { 65 if (!IS_ERR(dsp_wdt.fclk)) {
66 dsp_wdt.iclk = clk_get(NULL, "wdt3_ick"); 66 dsp_wdt.iclk = clk_get(NULL, "wdt3_ick");
67 if (!dsp_wdt.iclk) { 67 if (IS_ERR(dsp_wdt.iclk)) {
68 clk_put(dsp_wdt.fclk); 68 clk_put(dsp_wdt.fclk);
69 dsp_wdt.fclk = NULL; 69 dsp_wdt.fclk = NULL;
70 ret = -EFAULT; 70 ret = -EFAULT;