diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-02-21 14:14:50 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 10:30:48 +0100 |
| commit | e661d0ddc58740eca41313fbb01f1612ff9c7878 (patch) | |
| tree | 379123cc50943ec923bd19952880b694ff3daac0 /sound/core | |
| parent | 8278ca8feb2748cf02d756ac6c5b9ab2e047c84a (diff) | |
| download | kernel_samsung_smdk4412-e661d0ddc58740eca41313fbb01f1612ff9c7878.tar.gz kernel_samsung_smdk4412-e661d0ddc58740eca41313fbb01f1612ff9c7878.tar.bz2 kernel_samsung_smdk4412-e661d0ddc58740eca41313fbb01f1612ff9c7878.zip | |
[ALSA] pcm - Move PAUSE ioctl to common ioctl handler
Modules: PCM Midlevel
Moved PAUSE ioctl to the common ioctl handler.
A capture stream may issue PAUSE, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_native.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index ce1956a5528..01f150f0990 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2539,6 +2539,14 @@ static int snd_pcm_common_ioctl1(struct snd_pcm_substream *substream, return snd_pcm_drain(substream); case SNDRV_PCM_IOCTL_DROP: return snd_pcm_drop(substream); + case SNDRV_PCM_IOCTL_PAUSE: + { + int res; + snd_pcm_stream_lock_irq(substream); + res = snd_pcm_pause(substream, (int)(unsigned long)arg); + snd_pcm_stream_unlock_irq(substream); + return res; + } } snd_printd("unknown ioctl = 0x%x\n", cmd); return -ENOTTY; @@ -2619,14 +2627,6 @@ static int snd_pcm_playback_ioctl1(struct snd_pcm_substream *substream, __put_user(result, _frames); return result < 0 ? result : 0; } - case SNDRV_PCM_IOCTL_PAUSE: - { - int res; - snd_pcm_stream_lock_irq(substream); - res = snd_pcm_pause(substream, (int)(unsigned long)arg); - snd_pcm_stream_unlock_irq(substream); - return res; - } } return snd_pcm_common_ioctl1(substream, cmd, arg); } |