diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:33:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:33:02 +0200 |
| commit | df9200dd0454c91c5436c22072611f0edd3b5f42 (patch) | |
| tree | 25a23f85d6d911f9bd71c9b2fea8e84b5b5c7b14 /sound | |
| parent | 2c0d19a78de1ea5d0e92d86be0b16ccab0feccec (diff) | |
| parent | 51840409b6c928eead140157d4e9fc267f50caf9 (diff) | |
| download | linux-3.10-df9200dd0454c91c5436c22072611f0edd3b5f42.tar.gz linux-3.10-df9200dd0454c91c5436c22072611f0edd3b5f42.tar.bz2 linux-3.10-df9200dd0454c91c5436c22072611f0edd3b5f42.zip | |
Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus
* topic/pcm-estrpipe-in-pm:
ALSA: pcm - Tell user that stream to be rewound is suspended
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_native.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index b08898cbfed..59e5fbe6af5 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2214,6 +2214,9 @@ static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *subst case SNDRV_PCM_STATE_XRUN: ret = -EPIPE; goto __end; + case SNDRV_PCM_STATE_SUSPENDED: + ret = -ESTRPIPE; + goto __end; default: ret = -EBADFD; goto __end; @@ -2259,6 +2262,9 @@ static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substr case SNDRV_PCM_STATE_XRUN: ret = -EPIPE; goto __end; + case SNDRV_PCM_STATE_SUSPENDED: + ret = -ESTRPIPE; + goto __end; default: ret = -EBADFD; goto __end; @@ -2305,6 +2311,9 @@ static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *subs case SNDRV_PCM_STATE_XRUN: ret = -EPIPE; goto __end; + case SNDRV_PCM_STATE_SUSPENDED: + ret = -ESTRPIPE; + goto __end; default: ret = -EBADFD; goto __end; @@ -2351,6 +2360,9 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst case SNDRV_PCM_STATE_XRUN: ret = -EPIPE; goto __end; + case SNDRV_PCM_STATE_SUSPENDED: + ret = -ESTRPIPE; + goto __end; default: ret = -EBADFD; goto __end; |