From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 19 Apr 2001 11:15:35 +0000 (+0000)
Subject: Fixed typos
X-Git-Tag: v1.0.3~875
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=996be745d14ad8ae603d3e218cde7e0dba344043;p=alsa-lib.git

Fixed typos
---

diff --git a/src/pcm/pcm_surr.c b/src/pcm/pcm_surr.c
index 2afa0401..fa9f1cd7 100644
--- a/src/pcm/pcm_surr.c
+++ b/src/pcm/pcm_surr.c
@@ -168,12 +168,7 @@ static snd_pcm_sframes_t snd_pcm_surround_writei(snd_pcm_t *pcm, const void *buf
 {
 	snd_pcm_surround_t *surr = pcm->private_data;
 	if (surr->pcms == 1)
-		return snd_pcm_writei(pcm, buffer, size);
-	if (pcm->running_areas == NULL) {
-		int err;
-		if ((err = snd_pcm_mmap(pcm)) < 0)
-			return err;
-	}
+		return snd_pcm_writei(surr->pcm[0], buffer, size);
 	return snd_pcm_mmap_writei(pcm, buffer, size);
 }
 
@@ -198,9 +193,8 @@ static snd_pcm_sframes_t snd_pcm_surround_readi(snd_pcm_t *pcm, void *buffer, sn
 {
 	snd_pcm_surround_t *surr = pcm->private_data;
 	if (surr->pcms == 1)
-		return snd_pcm_readi(pcm, buffer, size);
-	/* TODO: convert two or three stereo streams to one interleaved stream */
-	return -EIO;
+		return snd_pcm_readi(surr->pcm[0], buffer, size);
+	return snd_pcm_mmap_readi(pcm, buffer, size);
 }
 
 static snd_pcm_sframes_t snd_pcm_surround_readn(snd_pcm_t *pcm, void **bufs, snd_pcm_uframes_t size)