diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2018-05-20 11:26:40 -0400 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-05-21 16:34:38 -0400 |
commit | 046dbb2420cee74b31fd2ce266d3e2629d8c7b8a (patch) | |
tree | 745f823c644ab6af8f4dae77656e06e29d9cc194 | |
parent | 48e9a9b203affc57a2bf6a0d0483472dd950a455 (diff) |
rtc: nvmem: don't use IS_ERR_OR_NULL
nvmem_register() never returns NULL, so IS_ERR is good enough here.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r-- | drivers/rtc/nvmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/nvmem.c b/drivers/rtc/nvmem.c index 17ec4c8d0fad..36ab183c42f1 100644 --- a/drivers/rtc/nvmem.c +++ b/drivers/rtc/nvmem.c | |||
@@ -94,7 +94,7 @@ int rtc_nvmem_register(struct rtc_device *rtc, | |||
94 | nvmem_config->dev = rtc->dev.parent; | 94 | nvmem_config->dev = rtc->dev.parent; |
95 | nvmem_config->owner = rtc->owner; | 95 | nvmem_config->owner = rtc->owner; |
96 | rtc->nvmem = nvmem_register(nvmem_config); | 96 | rtc->nvmem = nvmem_register(nvmem_config); |
97 | if (IS_ERR_OR_NULL(rtc->nvmem)) | 97 | if (IS_ERR(rtc->nvmem)) |
98 | return PTR_ERR(rtc->nvmem); | 98 | return PTR_ERR(rtc->nvmem); |
99 | 99 | ||
100 | /* Register the old ABI */ | 100 | /* Register the old ABI */ |