git.samba.org
/
jlayton
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[jlayton/linux.git]
/
drivers
/
rtc
/
rtc-isl12057.c
diff --git
a/drivers/rtc/rtc-isl12057.c
b/drivers/rtc/rtc-isl12057.c
index 7e5ead936a04b5ef5b07c20c8bbd689a10ef0d3a..41bd76aaff7661b11bf12aa327f9edde095b5985 100644
(file)
--- a/
drivers/rtc/rtc-isl12057.c
+++ b/
drivers/rtc/rtc-isl12057.c
@@
-274,10
+274,7
@@
static int isl12057_probe(struct i2c_client *client,
dev_set_drvdata(dev, data);
rtc = devm_rtc_device_register(dev, DRV_NAME, &rtc_ops, THIS_MODULE);
- if (IS_ERR(rtc))
- return PTR_ERR(rtc);
-
- return 0;
+ return PTR_ERR_OR_ZERO(rtc);
}
#ifdef CONFIG_OF