sound fixes for 3.16-rc3
Linus,
please pull sound fixes for v3.17-rc3 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-3.17-rc3
The topmost commit is 1a22e7758eabc431d6d8af085dc6e4c5031779a6
----------------------------------------------------------------
sound fixes for 3.17-rc3
Here contains not many exciting changes but just a few minor ones:
An off-by-one proc write fix, a couple of trivial incldue guard fixes, Acer laptop pinconfig fix, and a fix for DSD formats that are still rarely used.
----------------------------------------------------------------
Clemens Ladisch (1):
ALSA: core: fix buffer overflow in snd_info_get_line()
Rasmus Villemoes (2):
ALSA: hda: ca0132_regs.h: Fix typo in include guard
ALSA: ctxfi: ct20k1reg: Fix typo in include guard
Takashi Iwai (2):
ALSA: pcm: Fix the silence data for DSD formats
ALSA: hda - Set up initial pins for Acer Aspire V5
--- sound/core/info.c | 4 ++-- sound/core/pcm_misc.c | 4 ++-- sound/pci/ctxfi/ct20k1reg.h | 4 +--- sound/pci/hda/ca0132_regs.h | 2 +- sound/pci/hda/patch_realtek.c | 18 ++++++++++++++++++ 5 files changed, 24 insertions(+), 8 deletions(-)
sound/core/info.c +2 -2
@@ -684,7 +684,7 @@ int snd_info_card_free(struct snd_card *card)* snd_info_get_line - read one line from the procfs buffer * @buffer: the procfs buffer * @line: the buffer to store -* @len: the max. buffer size - 1 +* @len: the max. buffer size * * Reads one line from the buffer and stores the string. *
@@ -704,7 +704,7 @@ int snd_info_get_line(struct snd_info_buffer *buffer, char *line, int len) buffer->stop =1 ;if (c =='\n' )break ; -if (len) { +if (len >1 ) { len--; *line++ = c; }
sound/core/pcm_misc.c +2 -2
@@ -142,11 +142,11 @@ static struct pcm_format_data pcm_formats[(INT)SNDRV_PCM_FORMAT_LAST+1] = { }, [SNDRV_PCM_FORMAT_DSD_U8] = { .width = 8, .phys = 8, .le = 1, .signd = 0, - .silence = {}, + .silence = { 0x69 }, }, [SNDRV_PCM_FORMAT_DSD_U16_LE] = { .width = 16, .phys = 16, .le = 1, .signd = 0, - .silence = {}, + .silence = { 0x69, 0x69 }, }, /* FIXME: the following three formats are not defined properly yet */ [SNDRV_PCM_FORMAT_MPEG] = {
sound/pci/ctxfi/ct20k1reg.h +1 -3
@@ -7,7 +7,7 @@*/ #ifndef CT20K1REG_H -#define CT20k1REG_H +#define CT20K1REG_H /* 20k1 registers */ #define DSPXRAM_START 0x000000
@@ -632,5 +632,3 @@#define I2SD_R 0x19L#endif /* CT20K1REG_H */ - -
sound/pci/hda/ca0132_regs.h +1 -1
@@ -20,7 +20,7 @@*/ #ifndef __CA0132_REGS_H -#define __CA0312_REGS_H +#define __CA0132_REGS_H#define DSP_CHIP_OFFSET 0x100000#define DSP_DBGCNTL_MODULE_OFFSET 0xE30
sound/pci/hda/patch_realtek.c +18 -0
@@ -4408,6 +4408,7 @@ enum {ALC292_FIXUP_TPT440_DOCK ,ALC283_FIXUP_BXBT2807_MIC ,ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED , + ALC282_FIXUP_ASPIRE_V5_PINS, }; static const struct hda_fixup alc269_fixups[] = {
@@ -4855,6 +4856,22 @@ static const struct hda_fixup alc269_fixups[] = { .chained_before = true, .chain_id =ALC255_FIXUP_DELL1_MIC_NO_PRESENCE }, + [ALC282_FIXUP_ASPIRE_V5_PINS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl []) { + {0x12 ,0x90a60130 }, + {0x14 ,0x90170110 }, + {0x17 ,0x40000008 }, + {0x18 ,0x411111f0 }, + {0x19 ,0x411111f0 }, + {0x1a ,0x411111f0 }, + {0x1b ,0x411111f0 }, + {0x1d ,0x40f89b2d }, + {0x1e ,0x411111f0 }, + {0x21 ,0x0321101f }, + { }, + }, + }, };
@@ -4866,6 +4883,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x1025 ,0x0740 ,"Acer AO725" ,ALC271_FIXUP_HP_GATE_MIC_JACK ),SND_PCI_QUIRK (0x1025 ,0x0742 ,"Acer AO756" ,ALC271_FIXUP_HP_GATE_MIC_JACK ),SND_PCI_QUIRK (0x1025 ,0x0775 ,"Acer Aspire E1-572" ,ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572 ), +SND_PCI_QUIRK (0x1025 ,0x079b ,"Acer Aspire V5-573G" ,ALC282_FIXUP_ASPIRE_V5_PINS ),SND_PCI_QUIRK (0x1028 ,0x0470 ,"Dell M101z" ,ALC269_FIXUP_DELL_M101Z ),SND_PCI_QUIRK (0x1028 ,0x05bd ,"Dell" ,ALC269_FIXUP_DELL2_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1028, 0x05be, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),