Skip to content

Commit

Permalink
staging: tidspbridge: fix return value check in dsp_wdt_init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Yongjun authored and Greg Kroah-Hartman committed Sep 21, 2012
1 parent a00979c commit b0ba767
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/tidspbridge/core/wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b0ba767

Please sign in to comment.