Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'sound-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
"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"

* tag 'sound-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Set up initial pins for Acer Aspire V5
ALSA: pcm: Fix the silence data for DSD formats
ALSA: ctxfi: ct20k1reg: Fix typo in include guard
ALSA: hda: ca0132_regs.h: Fix typo in include guard
ALSA: core: fix buffer overflow in snd_info_get_line()

+24 -8
+2 -2
sound/core/info.c
··· 684 684 * snd_info_get_line - read one line from the procfs buffer 685 685 * @buffer: the procfs buffer 686 686 * @line: the buffer to store 687 - * @len: the max. buffer size - 1 687 + * @len: the max. buffer size 688 688 * 689 689 * Reads one line from the buffer and stores the string. 690 690 * ··· 704 704 buffer->stop = 1; 705 705 if (c == '\n') 706 706 break; 707 - if (len) { 707 + if (len > 1) { 708 708 len--; 709 709 *line++ = c; 710 710 }
+2 -2
sound/core/pcm_misc.c
··· 142 142 }, 143 143 [SNDRV_PCM_FORMAT_DSD_U8] = { 144 144 .width = 8, .phys = 8, .le = 1, .signd = 0, 145 - .silence = {}, 145 + .silence = { 0x69 }, 146 146 }, 147 147 [SNDRV_PCM_FORMAT_DSD_U16_LE] = { 148 148 .width = 16, .phys = 16, .le = 1, .signd = 0, 149 - .silence = {}, 149 + .silence = { 0x69, 0x69 }, 150 150 }, 151 151 /* FIXME: the following three formats are not defined properly yet */ 152 152 [SNDRV_PCM_FORMAT_MPEG] = {
+1 -3
sound/pci/ctxfi/ct20k1reg.h
··· 7 7 */ 8 8 9 9 #ifndef CT20K1REG_H 10 - #define CT20k1REG_H 10 + #define CT20K1REG_H 11 11 12 12 /* 20k1 registers */ 13 13 #define DSPXRAM_START 0x000000 ··· 632 632 #define I2SD_R 0x19L 633 633 634 634 #endif /* CT20K1REG_H */ 635 - 636 -
+1 -1
sound/pci/hda/ca0132_regs.h
··· 20 20 */ 21 21 22 22 #ifndef __CA0132_REGS_H 23 - #define __CA0312_REGS_H 23 + #define __CA0132_REGS_H 24 24 25 25 #define DSP_CHIP_OFFSET 0x100000 26 26 #define DSP_DBGCNTL_MODULE_OFFSET 0xE30
+18
sound/pci/hda/patch_realtek.c
··· 4408 4408 ALC292_FIXUP_TPT440_DOCK, 4409 4409 ALC283_FIXUP_BXBT2807_MIC, 4410 4410 ALC255_FIXUP_DELL_WMI_MIC_MUTE_LED, 4411 + ALC282_FIXUP_ASPIRE_V5_PINS, 4411 4412 }; 4412 4413 4413 4414 static const struct hda_fixup alc269_fixups[] = { ··· 4856 4855 .chained_before = true, 4857 4856 .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE 4858 4857 }, 4858 + [ALC282_FIXUP_ASPIRE_V5_PINS] = { 4859 + .type = HDA_FIXUP_PINS, 4860 + .v.pins = (const struct hda_pintbl[]) { 4861 + { 0x12, 0x90a60130 }, 4862 + { 0x14, 0x90170110 }, 4863 + { 0x17, 0x40000008 }, 4864 + { 0x18, 0x411111f0 }, 4865 + { 0x19, 0x411111f0 }, 4866 + { 0x1a, 0x411111f0 }, 4867 + { 0x1b, 0x411111f0 }, 4868 + { 0x1d, 0x40f89b2d }, 4869 + { 0x1e, 0x411111f0 }, 4870 + { 0x21, 0x0321101f }, 4871 + { }, 4872 + }, 4873 + }, 4859 4874 4860 4875 }; 4861 4876 ··· 4883 4866 SND_PCI_QUIRK(0x1025, 0x0740, "Acer AO725", ALC271_FIXUP_HP_GATE_MIC_JACK), 4884 4867 SND_PCI_QUIRK(0x1025, 0x0742, "Acer AO756", ALC271_FIXUP_HP_GATE_MIC_JACK), 4885 4868 SND_PCI_QUIRK(0x1025, 0x0775, "Acer Aspire E1-572", ALC271_FIXUP_HP_GATE_MIC_JACK_E1_572), 4869 + SND_PCI_QUIRK(0x1025, 0x079b, "Acer Aspire V5-573G", ALC282_FIXUP_ASPIRE_V5_PINS), 4886 4870 SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), 4887 4871 SND_PCI_QUIRK(0x1028, 0x05bd, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE), 4888 4872 SND_PCI_QUIRK(0x1028, 0x05be, "Dell", ALC269_FIXUP_DELL2_MIC_NO_PRESENCE),