summaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-10-02 10:26:02 -0300
committerGitHub <noreply@github.com>2018-10-02 10:26:02 -0300
commit5f3fecbc0715a70437501e1d85e74726c4f561be (patch)
treef10a85be5659f9b2f8f3ca4aff41d8fd3aa01b37 /drivers/rtc
parentded0ac8f40f9561d8ab2f8ef6c9ff8dc435f2b41 (diff)
parentc98b0c5db65001d10d7f0af026801b9c193c369e (diff)
Merge pull request #38 from gibsson/4.9-2.3.x-imx
Merge v4.9.130 into 4.9-2.3.x imx
Diffstat (limited to 'drivers/rtc')
-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 bd170cb3361c..5747a54cbd42 100644
--- a/drivers/rtc/rtc-bq4802.c
+++ b/drivers/rtc/rtc-bq4802.c
@@ -164,6 +164,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 {