git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-pcf2127.c
diff --git
a/drivers/rtc/rtc-pcf2127.c
b/drivers/rtc/rtc-pcf2127.c
index
1ee514a
..
9bd842e
100644
(file)
--- a/
drivers/rtc/rtc-pcf2127.c
+++ b/
drivers/rtc/rtc-pcf2127.c
@@
-197,10
+197,7
@@
static int pcf2127_probe(struct i2c_client *client,
pcf2127_driver.driver.name,
&pcf2127_rtc_ops, THIS_MODULE);
- if (IS_ERR(pcf2127->rtc))
- return PTR_ERR(pcf2127->rtc);
-
- return 0;
+ return PTR_ERR_OR_ZERO(pcf2127->rtc);
}
static const struct i2c_device_id pcf2127_id[] = {