Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df9200dd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

sound/core/pcm_native.c

+12 −0
Original line number Diff line number Diff line
@@ -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;