summaryrefslogtreecommitdiff
path: root/kernel/time/posix-timers.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-11-27 12:40:51 +0100
committerTakashi Iwai <tiwai@suse.de>2014-11-27 12:40:51 +0100
commitacf403ecc4155153e5e2c1640be90fc166e56ba7 (patch)
treee9655b84776cec00a4da077f5dd1e336dfd9c7c0 /kernel/time/posix-timers.c
parent69eba10e606a80665f8573221fec589430d9d1cb (diff)
parentb61f90eac1ff9d1b30497e611aba4651d4066706 (diff)
Merge branch 'topic/usb-resume' into for-next
Merge the proper mixer resume support for quirk codes.
Diffstat (limited to 'kernel/time/posix-timers.c')
-rw-r--r--kernel/time/posix-timers.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 42b463ad90f2..31ea01f42e1f 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -636,6 +636,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
goto out;
}
} else {
+ memset(&event.sigev_value, 0, sizeof(event.sigev_value));
event.sigev_notify = SIGEV_SIGNAL;
event.sigev_signo = SIGALRM;
event.sigev_value.sival_int = new_timer->it_id;