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

Commit fb4bd0ad authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files

[ALSA] OSS PCM emulation - The final fix for SNDCTL_DSP_GETOPTR problem 



ALSA<-OSS emulation
The problem was negative result (info.bytes) in a specific condition at
playback startup.

Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 21cb2a2e

sound/core/oss/pcm_oss.c

+5 −2
Original line number Diff line number Diff line
@@ -1539,11 +1539,14 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str 
	} else {

		delay = snd_pcm_oss_bytes(substream, delay) + fixup;

		info.blocks = delay / runtime->oss.period_bytes;

		if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		if (stream == SNDRV_PCM_STREAM_PLAYBACK) {

			if (runtime->oss.bytes == 0)

				delay = 0;

			info.bytes = (runtime->oss.bytes - delay) & INT_MAX;

		else

		} else {

			info.bytes = (runtime->oss.bytes + delay) & INT_MAX;

		}

	}

	if (copy_to_user(_info, &info, sizeof(info)))

		return -EFAULT;

	return 0;