projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
080c4a4
)
ALSA: timer: Fix broken compat timer user status ioctl
author
Takashi Iwai
<tiwai@suse.de>
Sun, 28 Feb 2016 10:36:14 +0000
(11:36 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 9 Mar 2016 23:31:55 +0000
(15:31 -0800)
commit
3a72494ac2a3bd229db941d51e7efe2f6ccd947b
upstream.
The timer user status compat ioctl returned the bogus struct used for
64bit architectures instead of the 32bit one. This patch addresses
it to return the proper struct.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/core/timer_compat.c
patch
|
blob
|
blame
|
history
diff --git
a/sound/core/timer_compat.c
b/sound/core/timer_compat.c
index 1314b732bff362433cf4036b613c0f2a7ae6c0f1..2e908225d754cfd4f4d23aa40abab01785351456 100644
(file)
--- a/
sound/core/timer_compat.c
+++ b/
sound/core/timer_compat.c
@@
-70,13
+70,14
@@
static int snd_timer_user_status_compat(struct file *file,
struct snd_timer_status32 __user *_status)
{
struct snd_timer_user *tu;
- struct snd_timer_status status;
+ struct snd_timer_status
32
status;
tu = file->private_data;
if (snd_BUG_ON(!tu->timeri))
return -ENXIO;
memset(&status, 0, sizeof(status));
- status.tstamp = tu->tstamp;
+ status.tstamp.tv_sec = tu->tstamp.tv_sec;
+ status.tstamp.tv_nsec = tu->tstamp.tv_nsec;
status.resolution = snd_timer_resolution(tu->timeri);
status.lost = tu->timeri->lost;
status.overrun = tu->overrun;