summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhouyang Jia <jiazhouyang09@gmail.com>2018-06-12 12:40:03 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-26 08:39:41 +0200
commit04ea31a181d3db645d4ecb5cc1b8f7bf7e7950cc (patch)
treeb7ffa3298dd4be0dbe89ddcaa5e6be94a2bbe7bd
parent1950f800faa1981d48535322ee68e9131d4ddff4 (diff)
downloadlinux-stable-04ea31a181d3db645d4ecb5cc1b8f7bf7e7950cc.tar.gz
linux-stable-04ea31a181d3db645d4ecb5cc1b8f7bf7e7950cc.tar.bz2
linux-stable-04ea31a181d3db645d4ecb5cc1b8f7bf7e7950cc.zip
rtc: bq4802: add error handling for devm_ioremap
[ Upstream commit 7874b919866ba91bac253fa219d3d4c82bb944df ] When devm_ioremap fails, the lack of error-handling code may cause unexpected results. This patch adds error-handling code after calling devm_ioremap. Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/rtc/rtc-bq4802.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c
index d768f6747961..113493b52149 100644
--- a/drivers/rtc/rtc-bq4802.c
+++ b/drivers/rtc/rtc-bq4802.c
@@ -162,6 +162,10 @@ static int bq4802_probe(struct platform_device *pdev)
} else if (p->r->flags & IORESOURCE_MEM) {
p->regs = devm_ioremap(&pdev->dev, p->r->start,
resource_size(p->r));
+ if (!p->regs){
+ err = -ENOMEM;
+ goto out;
+ }
p->read = bq4802_read_mem;
p->write = bq4802_write_mem;
} else {