diff --git a/[refs] b/[refs]
index 2cef613791a9..f7483ab0de8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6ec894b6d6bf12885a34a4667bccb7f67e2916c
+refs/heads/master: c82590d2b2877ec846c5313ea897420209b91ea7
diff --git a/trunk/sound/core/oss/pcm_plugin.c b/trunk/sound/core/oss/pcm_plugin.c
index cec2774425ec..0e67dd280a5d 100644
--- a/trunk/sound/core/oss/pcm_plugin.c
+++ b/trunk/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);