]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: Add more fallbacks to OSS PHONEOUT mixer map
authorTakashi Iwai <tiwai@suse.de>
Mon, 4 Feb 2008 11:44:11 +0000 (12:44 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 6 Aug 2008 17:11:06 +0000 (10:11 -0700)
commit 6c4cc3a8ed15aacc06a5fd369639fef633cee2bc upstream

Added more fallbacks to OSS PHONEOUT mixer mapping.  This corresponds
to the speaker output in general, so now "Mono" and "Speaker" are
assigned.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/core/oss/mixer_oss.c

index 75daed298a15a251fcf3a4af20b4651b905326ea..581aa2c60e6529fab85d27a3250151383e58f49f 100644 (file)
@@ -1257,6 +1257,8 @@ static void snd_mixer_oss_build(struct snd_mixer_oss *mixer)
                { SOUND_MIXER_DIGITAL3, "Digital",              2 },
                { SOUND_MIXER_PHONEIN,  "Phone",                0 },
                { SOUND_MIXER_PHONEOUT, "Master Mono",          0 },
+               { SOUND_MIXER_PHONEOUT, "Speaker",              0 }, /*fallback*/
+               { SOUND_MIXER_PHONEOUT, "Mono",                 0 }, /*fallback*/
                { SOUND_MIXER_PHONEOUT, "Phone",                0 }, /* fallback */
                { SOUND_MIXER_VIDEO,    "Video",                0 },
                { SOUND_MIXER_RADIO,    "Radio",                0 },