diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-28 11:36:14 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-03-07 16:05:26 +0100 |
| commit | a4804d0e21dfa0aa67d51b2ffb9c3ee9f9acaa16 (patch) | |
| tree | c69a346f119fb4177896ee47f52a09dcb8e2a6c1 /sound | |
| parent | a041d47fcdb1032b09636e4f8183f089999a7e0d (diff) | |
ALSA: timer: Fix broken compat timer user status ioctl
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/timer_compat.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/timer_compat.c b/sound/core/timer_compat.c index 1314b732bff3..2e908225d754 100644 --- 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_status32 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; |