diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-10 09:33:02 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 09:33:02 -0400 |
| commit | df9200dd0454c91c5436c22072611f0edd3b5f42 (patch) | |
| tree | 25a23f85d6d911f9bd71c9b2fea8e84b5b5c7b14 /sound/core | |
| parent | 2c0d19a78de1ea5d0e92d86be0b16ccab0feccec (diff) | |
| parent | 51840409b6c928eead140157d4e9fc267f50caf9 (diff) | |
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/core')
| -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 b08898cbfed3..59e5fbe6af51 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 | |||
| 2214 | case SNDRV_PCM_STATE_XRUN: | 2214 | case SNDRV_PCM_STATE_XRUN: |
| 2215 | ret = -EPIPE; | 2215 | ret = -EPIPE; |
| 2216 | goto __end; | 2216 | goto __end; |
| 2217 | case SNDRV_PCM_STATE_SUSPENDED: | ||
| 2218 | ret = -ESTRPIPE; | ||
| 2219 | goto __end; | ||
| 2217 | default: | 2220 | default: |
| 2218 | ret = -EBADFD; | 2221 | ret = -EBADFD; |
| 2219 | goto __end; | 2222 | goto __end; |
| @@ -2259,6 +2262,9 @@ static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substr | |||
| 2259 | case SNDRV_PCM_STATE_XRUN: | 2262 | case SNDRV_PCM_STATE_XRUN: |
| 2260 | ret = -EPIPE; | 2263 | ret = -EPIPE; |
| 2261 | goto __end; | 2264 | goto __end; |
| 2265 | case SNDRV_PCM_STATE_SUSPENDED: | ||
| 2266 | ret = -ESTRPIPE; | ||
| 2267 | goto __end; | ||
| 2262 | default: | 2268 | default: |
| 2263 | ret = -EBADFD; | 2269 | ret = -EBADFD; |
| 2264 | goto __end; | 2270 | goto __end; |
| @@ -2305,6 +2311,9 @@ static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *subs | |||
| 2305 | case SNDRV_PCM_STATE_XRUN: | 2311 | case SNDRV_PCM_STATE_XRUN: |
| 2306 | ret = -EPIPE; | 2312 | ret = -EPIPE; |
| 2307 | goto __end; | 2313 | goto __end; |
| 2314 | case SNDRV_PCM_STATE_SUSPENDED: | ||
| 2315 | ret = -ESTRPIPE; | ||
| 2316 | goto __end; | ||
| 2308 | default: | 2317 | default: |
| 2309 | ret = -EBADFD; | 2318 | ret = -EBADFD; |
| 2310 | goto __end; | 2319 | goto __end; |
| @@ -2351,6 +2360,9 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst | |||
| 2351 | case SNDRV_PCM_STATE_XRUN: | 2360 | case SNDRV_PCM_STATE_XRUN: |
| 2352 | ret = -EPIPE; | 2361 | ret = -EPIPE; |
| 2353 | goto __end; | 2362 | goto __end; |
| 2363 | case SNDRV_PCM_STATE_SUSPENDED: | ||
| 2364 | ret = -ESTRPIPE; | ||
| 2365 | goto __end; | ||
| 2354 | default: | 2366 | default: |
| 2355 | ret = -EBADFD; | 2367 | ret = -EBADFD; |
| 2356 | goto __end; | 2368 | goto __end; |