commit c82590d2b2877ec846c5313ea897420209b91ea7
author Takashi Iwai <tiwai@suse.de> Fri Jan 20 17:13:45 2006 +0100
committer Jaroslav Kysela <perex@suse.cz> Wed Mar 22 10:28:02 2006 +0100
tree 1fff44f8e7912cd2f49051749a57299184f69ff4
parent d6ec894b6d6bf12885a34a4667bccb7f67e2916c

[ALSA] Fix mulaw -> linear conversion in OSS PCM emulation

Modules: ALSA<-OSS emulation

Fixed the missing mulaw -> linear conversion in OSS PCM emulation code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/core/oss/pcm_plugin.c

diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index cec2774..0e67dd2 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -470,7 +470,8 @@
 	/* format change */
 	if (srcformat.format != dstformat.format) {
 		tmpformat.format = dstformat.format;
-		if (tmpformat.format == SNDRV_PCM_FORMAT_MU_LAW) {
+		if (srcformat.format == SNDRV_PCM_FORMAT_MU_LAW ||
+		    tmpformat.format == SNDRV_PCM_FORMAT_MU_LAW) {
 			err = snd_pcm_plugin_build_mulaw(plug,
 							 &srcformat, &tmpformat,
 							 &plugin);