Commit b0ba7678 authored Sep 21, 2012 by Wei Yongjun Committed by Greg Kroah-Hartman Sep 21, 2012

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>

parent a00979cc

drivers/staging/tidspbridge/core/wdt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;