1 files changed, 12 insertions, 4 deletions

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 9265014cb4db..2d966244ea60 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -494,7 +494,7 @@ static int update_rmtp(ktime_t exp, enum  alarmtimer_type type,
  */
 static long __sched alarm_timer_nsleep_restart(struct restart_block *restart)
 {
-        enum  alarmtimer_type type = restart->nanosleep.index;
+        enum  alarmtimer_type type = restart->nanosleep.clockid;
         ktime_t exp;
         struct timespec __user  *rmtp;
         struct alarm alarm;
@@ -573,7 +573,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
 
         restart = &current_thread_info()->restart_block;
         restart->fn = alarm_timer_nsleep_restart;
-        restart->nanosleep.index = type;
+        restart->nanosleep.clockid = type;
         restart->nanosleep.expires = exp.tv64;
         restart->nanosleep.rmtp = rmtp;
         ret = -ERESTART_RESTARTBLOCK;
@@ -669,12 +669,20 @@ static int __init has_wakealarm(struct device *dev, void *name_ptr)
  */
 static int __init alarmtimer_init_late(void)
 {
+        struct device *dev;
         char *str;
 
         /* Find an rtc device and init the rtc_timer */
-        class_find_device(rtc_class, NULL, &str, has_wakealarm);
-        if (str)
+        dev = class_find_device(rtc_class, NULL, &str, has_wakealarm);
+        /* If we have a device then str is valid. See has_wakealarm() */
+        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");