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

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull sound fixes from Takashi Iwai:
"Here are a small collecton of sound fix patches.

The most significant one is the disablement of newly introduced
topology API. Its ABI couldn't be stabilized enough, so we decided to
delay for 4.3 in the end. Other than that, all oneliner fixes: a
USB-audio runtime PM fix and a couple of HD-audio quirks"

* tag 'sound-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Add dock support for Thinkpad W541 (17aa:2211)
ALSA: usb-audio: Fix runtime PM unbalance
ASoC: topology: Disable use from userspace
ASoC: topology: Add Kconfig option for topology
ALSA: hda - Fix the white noise on Dell laptop

Linus Torvalds a971dbca 3243f50b

+27 -1
+12
include/sound/soc-topology.h
··· 141 141 int io_ops_count; 142 142 }; 143 143 144 + #ifdef CONFIG_SND_SOC_TOPOLOGY 145 + 144 146 /* gets a pointer to data from the firmware block header */ 145 147 static inline const void *snd_soc_tplg_get_data(struct snd_soc_tplg_hdr *hdr) 146 148 { ··· 166 164 int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w, 167 165 const struct snd_soc_tplg_widget_events *events, int num_events, 168 166 u16 event_type); 167 + 168 + #else 169 + 170 + static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp, 171 + u32 index) 172 + { 173 + return 0; 174 + } 175 + 176 + #endif 169 177 170 178 #endif
+6
include/uapi/sound/asoc.h
··· 18 18 #include <linux/types.h> 19 19 #include <sound/asound.h> 20 20 21 + #ifndef __KERNEL__ 22 + #error This API is an early revision and not enabled in the current 23 + #error kernel release, it will be enabled in a future kernel version 24 + #error with incompatible changes to what is here. 25 + #endif 26 + 21 27 /* 22 28 * Maximum number of channels topology kcontrol can represent. 23 29 */
+2
sound/pci/hda/patch_realtek.c
··· 5190 5190 SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), 5191 5191 SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), 5192 5192 SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC292_FIXUP_DISABLE_AAMIX), 5193 + SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC292_FIXUP_DISABLE_AAMIX), 5193 5194 SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), 5194 5195 SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), 5195 5196 SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), ··· 5292 5291 SND_PCI_QUIRK(0x17aa, 0x220c, "Thinkpad T440s", ALC292_FIXUP_TPT440_DOCK), 5293 5292 SND_PCI_QUIRK(0x17aa, 0x220e, "Thinkpad T440p", ALC292_FIXUP_TPT440_DOCK), 5294 5293 SND_PCI_QUIRK(0x17aa, 0x2210, "Thinkpad T540p", ALC292_FIXUP_TPT440_DOCK), 5294 + SND_PCI_QUIRK(0x17aa, 0x2211, "Thinkpad W541", ALC292_FIXUP_TPT440_DOCK), 5295 5295 SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad T440", ALC292_FIXUP_TPT440_DOCK), 5296 5296 SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad X240", ALC292_FIXUP_TPT440_DOCK), 5297 5297 SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
+3
sound/soc/Kconfig
··· 30 30 bool 31 31 select SND_DMAENGINE_PCM 32 32 33 + config SND_SOC_TOPOLOGY 34 + bool 35 + 33 36 # All the supported SoCs 34 37 source "sound/soc/adi/Kconfig" 35 38 source "sound/soc/atmel/Kconfig"
+3
sound/soc/Makefile
··· 1 1 snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o 2 2 snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o 3 + 4 + ifneq ($(CONFIG_SND_SOC_TOPOLOGY),) 3 5 snd-soc-core-objs += soc-topology.o 6 + endif 4 7 5 8 ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) 6 9 snd-soc-core-objs += soc-generic-dmaengine-pcm.o
+1 -1
sound/usb/card.c
··· 638 638 int err = -ENODEV; 639 639 640 640 down_read(&chip->shutdown_rwsem); 641 - if (chip->probing && chip->in_pm) 641 + if (chip->probing || chip->in_pm) 642 642 err = 0; 643 643 else if (!chip->shutdown) 644 644 err = usb_autopm_get_interface(chip->pm_intf);