diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-05-15 17:43:54 +0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2005-05-29 12:10:53 +0400 |
| commit | 8c50b37c04a026ab6641ecb7eaf0fd479798e8b8 (patch) | |
| tree | d4f6d64609ba587f94678d9765f2c2caff10494c /sound/core/timer_compat.c | |
| parent | 15790a6be14852850ee7cbd791225fa51750d8af (diff) | |
| download | linux-8c50b37c04a026ab6641ecb7eaf0fd479798e8b8.tar.xz | |
[ALSA] Change some timer ioctls due to confliction
Timer Midlevel,ALSA Core
Change values of some timer ioctls to avoid confliction with FIO* ioctls.
The protocol version is increased to indicate this change.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/timer_compat.c')
| -rw-r--r-- | sound/core/timer_compat.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/timer_compat.c b/sound/core/timer_compat.c index 420817d10b7c..3de552dfe80f 100644 --- a/sound/core/timer_compat.c +++ b/sound/core/timer_compat.c @@ -106,9 +106,13 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns case SNDRV_TIMER_IOCTL_SELECT: case SNDRV_TIMER_IOCTL_PARAMS: case SNDRV_TIMER_IOCTL_START: + case SNDRV_TIMER_IOCTL_START_OLD: case SNDRV_TIMER_IOCTL_STOP: + case SNDRV_TIMER_IOCTL_STOP_OLD: case SNDRV_TIMER_IOCTL_CONTINUE: + case SNDRV_TIMER_IOCTL_CONTINUE_OLD: case SNDRV_TIMER_IOCTL_PAUSE: + case SNDRV_TIMER_IOCTL_PAUSE_OLD: case SNDRV_TIMER_IOCTL_NEXT_DEVICE: return snd_timer_user_ioctl(file, cmd, (unsigned long)argp); case SNDRV_TIMER_IOCTL_INFO32: |