patch-2.2.6 linux/drivers/sound/audio.c

Next file: linux/drivers/sound/dev_table.c
Previous file: linux/drivers/sound/ad1848.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.5/linux/drivers/sound/audio.c linux/drivers/sound/audio.c
@@ -60,7 +60,10 @@
 	else
 		return audio_devs[dev]->local_format;
 
-	return audio_devs[dev]->local_format;
+	if (audio_devs[dev]->local_conversion)
+		return audio_devs[dev]->local_conversion;
+	else 
+		return audio_devs[dev]->local_format;
 }
 
 int audio_open(int dev, struct file *file)
@@ -387,7 +390,7 @@
 			return 0;
 
 		case SNDCTL_DSP_GETFMTS:
-			val = audio_devs[dev]->format_mask;
+			val = audio_devs[dev]->format_mask | AFMT_MU_LAW;
 			break;
 	
 		case SNDCTL_DSP_SETFMT:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)