Merge branch 'for-linus' into for-next (5a23f385) · Commits · e / devices / android_kernel_fairphone_FP5

sound/core/pcm_lib.c

+4 −16

Original line number	Diff line number	Diff line
		@@ -2112,13 +2112,6 @@ int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream,
		return 0;
		}

		/* allow waiting for a capture stream that hasn't been started */
		#if IS_ENABLED(CONFIG_SND_PCM_OSS)
		#define wait_capture_start(substream) ((substream)->oss.oss)
		#else
		#define wait_capture_start(substream) false
		#endif

		/* the common loop for read/write data */
		snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,
		void *data, bool interleaved,
		@@ -2184,16 +2177,11 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream,
		snd_pcm_update_hw_ptr(substream);

		if (!is_playback &&
		runtime->status->state == SNDRV_PCM_STATE_PREPARED) {
		if (size >= runtime->start_threshold) {
		runtime->status->state == SNDRV_PCM_STATE_PREPARED &&
		size >= runtime->start_threshold) {
		err = snd_pcm_start(substream);
		if (err < 0)
		goto _end_unlock;
		} else if (!wait_capture_start(substream)) {
		/* nothing to do */
		err = 0;
		goto _end_unlock;
		}
		}

		avail = snd_pcm_avail(substream);