summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-05-15 15:04:14 +0200
committerJaroslav Kysela <perex@suse.cz>2005-05-29 10:10:49 +0200
commit15790a6be14852850ee7cbd791225fa51750d8af (patch)
tree9dfed38c6fe1ce94174a69d514f9612e67d2c103 /sound/core
parent92bb010cd874e53e4c2e2a73510966e45cfa4525 (diff)
downloadop-kernel-dev-15790a6be14852850ee7cbd791225fa51750d8af.zip
op-kernel-dev-15790a6be14852850ee7cbd791225fa51750d8af.tar.gz
[ALSA] Add missing PAUSE ioctl
Timer Midlevel Added the missing implemenation of TIMER PAUSE ioctl. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/timer.c12
-rw-r--r--sound/core/timer_compat.c1
2 files changed, 13 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index be6d37a..48aebdf 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1680,6 +1680,16 @@ static int snd_timer_user_continue(struct file *file)
return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;
}
+static int snd_timer_user_pause(struct file *file)
+{
+ int err;
+ snd_timer_user_t *tu;
+
+ tu = file->private_data;
+ snd_assert(tu->timeri != NULL, return -ENXIO);
+ return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;
+}
+
static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
snd_timer_user_t *tu;
@@ -1729,6 +1739,8 @@ static long snd_timer_user_ioctl(struct file *file, unsigned int cmd, unsigned l
return snd_timer_user_stop(file);
case SNDRV_TIMER_IOCTL_CONTINUE:
return snd_timer_user_continue(file);
+ case SNDRV_TIMER_IOCTL_PAUSE:
+ return snd_timer_user_pause(file);
}
return -ENOTTY;
}
diff --git a/sound/core/timer_compat.c b/sound/core/timer_compat.c
index 9fbc395..420817d 100644
--- a/sound/core/timer_compat.c
+++ b/sound/core/timer_compat.c
@@ -108,6 +108,7 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns
case SNDRV_TIMER_IOCTL_START:
case SNDRV_TIMER_IOCTL_STOP:
case SNDRV_TIMER_IOCTL_CONTINUE:
+ case SNDRV_TIMER_IOCTL_PAUSE:
case SNDRV_TIMER_IOCTL_NEXT_DEVICE:
return snd_timer_user_ioctl(file, cmd, (unsigned long)argp);
case SNDRV_TIMER_IOCTL_INFO32:
OpenPOWER on IntegriCloud