Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248633
b: refs/heads/master
c: 179eb03
h: refs/heads/master
i:
  248631: e088062
v: v3
  • Loading branch information
Thomas Gleixner committed May 4, 2011
1 parent fe231b0 commit fc0a752
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ce788f930b0cdf821de7ee8f84cfe8cf7fcb6311
refs/heads/master: 179eb03268aa1da03d90f1566ea85dc1478d3ae3
8 changes: 7 additions & 1 deletion trunk/kernel/time/alarmtimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -675,8 +675,14 @@ static int __init alarmtimer_init_late(void)
/* Find an rtc device and init the rtc_timer */
dev = class_find_device(rtc_class, NULL, &str, has_wakealarm);
/* If we have a device then str is valid. See has_wakealarm() */
if (dev)
if (dev) {
rtcdev = rtc_class_open(str);
/*
* Drop the reference we got in class_find_device,
* rtc_open takes its own.
*/
put_device(dev);
}
if (!rtcdev) {
printk(KERN_WARNING "No RTC device found, ALARM timers will"
" not wake from suspend");
Expand Down

0 comments on commit fc0a752

Please sign in to comment.