projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
rtc
/
rtc-lpc32xx.c
diff --git
a/drivers/rtc/rtc-lpc32xx.c
b/drivers/rtc/rtc-lpc32xx.c
index bfdbcb82d069c223add9e774db0b543a0249d852..f130c08c98f851a3ec97c231ab18a1fe48dc92d8 100644
(file)
--- a/
drivers/rtc/rtc-lpc32xx.c
+++ b/
drivers/rtc/rtc-lpc32xx.c
@@
-211,10
+211,9
@@
static int lpc32xx_rtc_probe(struct platform_device *pdev)
}
rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
}
rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
- if (unlikely(!rtc)) {
- dev_err(&pdev->dev, "Can't allocate memory\n");
+ if (unlikely(!rtc))
return -ENOMEM;
return -ENOMEM;
- }
+
rtc->irq = rtcirq;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
rtc->irq = rtcirq;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);