sound fixes
Subsystems (3)
Linus,
please pull ALSA updates for v2.6.30-rc5 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
This contains the following trivial fixes.
Thanks!
Takashi
===
Clemens Ladisch (2):
sound: serial-u16550: fix buffer overflow
sound: via82xx: fix DXS volume range
Jaroslav Kysela (1):
ALSA: Release v1.0.20
Jinyoung Park (1):
ASoC: Fix errors in WM8990
Takashi Iwai (1):
ALSA: hda - Fix line-in on Mac Mini Core2 Duo
--- include/sound/version.h | 2 +- sound/drivers/serial-u16550.c | 11 +++-------- sound/pci/hda/patch_sigmatel.c | 7 ++++++- sound/pci/via82xx.c | 2 +- sound/soc/codecs/wm8990.c | 40 ++++++++++++++++++++-------------------- 5 files changed, 31 insertions(+), 31 deletions(-)
include/sound/version.h +1 -1
@@ -1,3 +1,3 @@/* include/version.h */ -#define CONFIG_SND_VERSION "1.0.19" +#define CONFIG_SND_VERSION "1.0.20"#define CONFIG_SND_DATE ""
sound/drivers/serial-u16550.c +3 -8
@@ -963,16 +963,11 @@ static int __devinit snd_serial_probe(struct platform_device *devptr)if (err <0 ) goto _err; -sprintf (card->longname,"%s at 0x%lx, irq %d speed %d div %d outs %d ins %d adaptor %s droponfull %d" , +sprintf (card->longname,"%s [%s] at %#lx, irq %d" , card->shortname, - uart->base, - uart->irq, - uart->speed, - (int )uart->divisor, - outs[dev], - ins[dev], adaptor_names[uart->adaptor], - uart->drop_on_full); + uart->base, + uart->irq);snd_card_set_dev (card, &devptr->dev);
sound/pci/hda/patch_sigmatel.c +6 -1
@@ -4079,7 +4079,12 @@ static int stac92xx_init(struct hda_codec *codec) pinctl =snd_hda_codec_read (codec, nid,0 ,AC_VERB_GET_PIN_WIDGET_CONTROL ,0 );/* if PINCTL already set then skip */ -if (!(pinctl &AC_PINCTL_IN_EN )) { +/* Also, if both INPUT and OUTPUT are set, +* it must be a BIOS bug; need to override, too +*/ +if (!(pinctl &AC_PINCTL_IN_EN ) || + (pinctl &AC_PINCTL_OUT_EN )) { + pinctl &= ~AC_PINCTL_OUT_EN ; pinctl |=AC_PINCTL_IN_EN ;stac92xx_auto_set_pinctl (codec, nid, pinctl);
sound/pci/via82xx.c +1 -1
@@ -1687,7 +1687,7 @@ static int snd_via8233_pcmdxs_volume_put(struct snd_kcontrol *kcontrol,return change; } -static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -9450, 150, 1); +static const DECLARE_TLV_DB_SCALE(db_scale_dxs, -4650, 150, 1);static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control__devinitdata = { .name ="PCM Playback Volume" ,
sound/soc/codecs/wm8990.c +20 -20
@@ -729,7 +729,7 @@ SND_SOC_DAPM_MIXER_E("INMIXL", WM8990_INTDRIVBITS, WM8990_INMIXL_PWR_BIT, 0, inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),/* AINLMUX */ -SND_SOC_DAPM_MUX_E ("AILNMUX" ,WM8990_INTDRIVBITS ,WM8990_AINLMUX_PWR_BIT ,0 , +SND_SOC_DAPM_MUX_E ("AINLMUX" ,WM8990_INTDRIVBITS ,WM8990_AINLMUX_PWR_BIT ,0 , &wm8990_dapm_ainlmux_controls, inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
@@ -740,7 +740,7 @@ SND_SOC_DAPM_MIXER_E("INMIXR", WM8990_INTDRIVBITS, WM8990_INMIXR_PWR_BIT, 0, inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),/* AINRMUX */ -SND_SOC_DAPM_MUX_E ("AIRNMUX" ,WM8990_INTDRIVBITS ,WM8990_AINRMUX_PWR_BIT ,0 , +SND_SOC_DAPM_MUX_E ("AINRMUX" ,WM8990_INTDRIVBITS ,WM8990_AINRMUX_PWR_BIT ,0 , &wm8990_dapm_ainrmux_controls, inmixer_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
@@ -848,40 +848,40 @@ static const struct snd_soc_dapm_route audio_map[] = { {"LIN12 PGA", "LIN2 Switch", "LIN2"},/* LIN34 PGA */ {"LIN34 PGA", "LIN3 Switch", "LIN3"}, - {"LIN34 PGA", "LIN4 Switch", "LIN4"}, + {"LIN34 PGA", "LIN4 Switch", "LIN4/RXN"},/* INMIXL */ {"INMIXL", "Record Left Volume", "LOMIX"}, {"INMIXL", "LIN2 Volume", "LIN2"}, {"INMIXL", "LINPGA12 Switch", "LIN12 PGA"}, {"INMIXL", "LINPGA34 Switch", "LIN34 PGA"}, -/* AILNMUX */ - {"AILNMUX", "INMIXL Mix", "INMIXL"}, - {"AILNMUX", "DIFFINL Mix", "LIN12PGA"}, - {"AILNMUX", "DIFFINL Mix", "LIN34PGA"}, - {"AILNMUX", "RXVOICE Mix", "LIN4/RXN"}, - {"AILNMUX", "RXVOICE Mix", "RIN4/RXP"}, +/* AINLMUX */ + {"AINLMUX", "INMIXL Mix", "INMIXL"}, + {"AINLMUX", "DIFFINL Mix", "LIN12 PGA"}, + {"AINLMUX", "DIFFINL Mix", "LIN34 PGA"}, + {"AINLMUX", "RXVOICE Mix", "LIN4/RXN"}, + {"AINLMUX", "RXVOICE Mix", "RIN4/RXP"},/* ADC */ - {"Left ADC", NULL, "AILNMUX"}, + {"Left ADC", NULL, "AINLMUX"},/* RIN12 PGA */ {"RIN12 PGA", "RIN1 Switch", "RIN1"}, {"RIN12 PGA", "RIN2 Switch", "RIN2"},/* RIN34 PGA */ {"RIN34 PGA", "RIN3 Switch", "RIN3"}, - {"RIN34 PGA", "RIN4 Switch", "RIN4"}, + {"RIN34 PGA", "RIN4 Switch", "RIN4/RXP"},/* INMIXL */ {"INMIXR", "Record Right Volume", "ROMIX"}, {"INMIXR", "RIN2 Volume", "RIN2"}, {"INMIXR", "RINPGA12 Switch", "RIN12 PGA"}, {"INMIXR", "RINPGA34 Switch", "RIN34 PGA"}, -/* AIRNMUX */ - {"AIRNMUX", "INMIXR Mix", "INMIXR"}, - {"AIRNMUX", "DIFFINR Mix", "RIN12PGA"}, - {"AIRNMUX", "DIFFINR Mix", "RIN34PGA"}, - {"AIRNMUX", "RXVOICE Mix", "RIN4/RXN"}, - {"AIRNMUX", "RXVOICE Mix", "RIN4/RXP"}, +/* AINRMUX */ + {"AINRMUX", "INMIXR Mix", "INMIXR"}, + {"AINRMUX", "DIFFINR Mix", "RIN12 PGA"}, + {"AINRMUX", "DIFFINR Mix", "RIN34 PGA"}, + {"AINRMUX", "RXVOICE Mix", "LIN4/RXN"}, + {"AINRMUX", "RXVOICE Mix", "RIN4/RXP"},/* ADC */ - {"Right ADC", NULL, "AIRNMUX"}, + {"Right ADC", NULL, "AINRMUX"},/* LOMIX */ {"LOMIX", "LOMIX RIN3 Bypass Switch", "RIN3"},
@@ -922,7 +922,7 @@ static const struct snd_soc_dapm_route audio_map[] = { {"LOPMIX", "LOPMIX Left Mixer PGA Switch", "LOPGA"},/* OUT3MIX */ - {"OUT3MIX", "OUT3MIX LIN4/RXP Bypass Switch", "LIN4/RXP"}, + {"OUT3MIX", "OUT3MIX LIN4/RXP Bypass Switch", "LIN4/RXN"}, {"OUT3MIX", "OUT3MIX Left Out PGA Switch", "LOPGA"}, /* OUT4MIX */
@@ -949,7 +949,7 @@ static const struct snd_soc_dapm_route audio_map[] = {/* Output Pins */ {"LON", NULL, "LONMIX"}, {"LOP", NULL, "LOPMIX"}, - {"OUT", NULL, "OUT3MIX"}, + {"OUT3", NULL, "OUT3MIX"}, {"LOUT", NULL, "LOUT PGA"}, {"SPKN", NULL, "SPKMIX"}, {"ROUT", NULL, "ROUT PGA"},