From 8a01db17a1e0ef85df687d06c50663609a5672f0 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 21 Sep 2012 14:00:04 +0800 Subject: [PATCH] --- yaml --- r: 325445 b: refs/heads/master c: b0ba76785eef21ecfa3bcd2f6358f9cebbd8a9db h: refs/heads/master i: 325443: 1a089b4b47901ac86a45cee62dd6fd2f05bc9969 v: v3 --- [refs] | 2 +- trunk/drivers/staging/tidspbridge/core/wdt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 25585df2afa8..b4a1ca1f11cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a00979cccb9cc9727b8357f8fdf1c1924c9b73ef +refs/heads/master: b0ba76785eef21ecfa3bcd2f6358f9cebbd8a9db diff --git a/trunk/drivers/staging/tidspbridge/core/wdt.c b/trunk/drivers/staging/tidspbridge/core/wdt.c index 1ed1474d0b56..e5adad08f1c4 100644 --- a/trunk/drivers/staging/tidspbridge/core/wdt.c +++ b/trunk/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;