Commit aaa65a9c authored Feb 09, 2017 by Wei Yongjun Committed by Alexandre Belloni Feb 12, 2017

rtc: sun6i: Fix return value check in sun6i_rtc_clk_init()



In case of error, the function of_io_request_and_map() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().

Fixes: 847b8bf62eb4 ("rtc: sun6i: Expose the 32kHz oscillator")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

parent 93946c49

drivers/rtc/rtc-sun6i.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node)
		spin_lock_init(&rtc->lock);

		rtc->base = of_io_request_and_map(node, 0, of_node_full_name(node));
		if (!rtc->base) {
		if (IS_ERR(rtc->base)) {
		pr_crit("Can't map RTC registers");
		return;
		}

Admin message