Commit df9200dd authored by Takashi Iwai's avatar Takashi Iwai

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
parents 2c0d19a7 51840409
...@@ -2214,6 +2214,9 @@ static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *subst ...@@ -2214,6 +2214,9 @@ static snd_pcm_sframes_t snd_pcm_playback_rewind(struct snd_pcm_substream *subst
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
ret = -EPIPE; ret = -EPIPE;
goto __end; goto __end;
case SNDRV_PCM_STATE_SUSPENDED:
ret = -ESTRPIPE;
goto __end;
default: default:
ret = -EBADFD; ret = -EBADFD;
goto __end; goto __end;
...@@ -2259,6 +2262,9 @@ static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substr ...@@ -2259,6 +2262,9 @@ static snd_pcm_sframes_t snd_pcm_capture_rewind(struct snd_pcm_substream *substr
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
ret = -EPIPE; ret = -EPIPE;
goto __end; goto __end;
case SNDRV_PCM_STATE_SUSPENDED:
ret = -ESTRPIPE;
goto __end;
default: default:
ret = -EBADFD; ret = -EBADFD;
goto __end; goto __end;
...@@ -2305,6 +2311,9 @@ static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *subs ...@@ -2305,6 +2311,9 @@ static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *subs
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
ret = -EPIPE; ret = -EPIPE;
goto __end; goto __end;
case SNDRV_PCM_STATE_SUSPENDED:
ret = -ESTRPIPE;
goto __end;
default: default:
ret = -EBADFD; ret = -EBADFD;
goto __end; goto __end;
...@@ -2351,6 +2360,9 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst ...@@ -2351,6 +2360,9 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
ret = -EPIPE; ret = -EPIPE;
goto __end; goto __end;
case SNDRV_PCM_STATE_SUSPENDED:
ret = -ESTRPIPE;
goto __end;
default: default:
ret = -EBADFD; ret = -EBADFD;
goto __end; goto __end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment