diff options
| author | Wei Yongjun <weiyongjun1@huawei.com> | 2017-02-09 00:16:13 +0000 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-02-12 00:34:31 +0100 |
| commit | aaa65a9ce685fcdf37d647ec1ef5afeb3d02c916 (patch) | |
| tree | 448605e52ece7821ce5b21816e27ac781322c83f /drivers/rtc | |
| parent | 93946c49cdafd6a2e4039a8208564fd18e9120c3 (diff) | |
| download | linux-stable-aaa65a9ce685fcdf37d647ec1ef5afeb3d02c916.tar.gz linux-stable-aaa65a9ce685fcdf37d647ec1ef5afeb3d02c916.tar.bz2 linux-stable-aaa65a9ce685fcdf37d647ec1ef5afeb3d02c916.zip | |
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>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-sun6i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c index 08510ca58996..39cbc1238b92 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c @@ -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; } |