From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 20 Jan 2006 16:13:45 +0000 (+0100)
Subject: [ALSA] Fix mulaw -> linear conversion in OSS PCM emulation
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c82590d2b2877ec846c5313ea897420209b91ea7;p=deliverable%2Flinux.git

[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>
---

diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index cec2774425ec..0e67dd280a5d 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -470,7 +470,8 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *plug,
 	/* 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);