projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-tps65910.c
diff --git
a/drivers/rtc/rtc-tps65910.c
b/drivers/rtc/rtc-tps65910.c
index
7af0020
..
2583349
100644
(file)
--- a/
drivers/rtc/rtc-tps65910.c
+++ b/
drivers/rtc/rtc-tps65910.c
@@
-258,6
+258,8
@@
static int tps65910_rtc_probe(struct platform_device *pdev)
if (ret < 0)
return ret;
+ platform_set_drvdata(pdev, tps_rtc);
+
irq = platform_get_irq(pdev, 0);
if (irq <= 0) {
dev_warn(&pdev->dev, "Wake up is not possible as irq = %d\n",
@@
-283,8
+285,6
@@
static int tps65910_rtc_probe(struct platform_device *pdev)
return ret;
}
- platform_set_drvdata(pdev, tps_rtc);
-
return 0;
}