sound fixes
Subsystems (3)
Linus,
please pull ALSA updates for v2.6.33-rc7 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
containing only the following trivial fixes.
Thanks!
Takashi
===
Anuj Aggarwal (2):
ASoC: AIC23: Fixing writes to non-existing registers in resume function
ASoC: AM3517: ASoC driver not getting compiled
Takashi Iwai (1):
ALSA: hda - Add an ASUS mobo to MSI blacklist
--- sound/pci/hda/hda_intel.c | 1 + sound/soc/codecs/tlv320aic23.c | 2 +- sound/soc/omap/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
sound/pci/hda/hda_intel.c +1 -0
@@ -2332,6 +2332,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev)*/ static struct snd_pci_quirk msi_black_list[]__devinitdata = {SND_PCI_QUIRK (0x1043 ,0x81f2 ,"ASUS" ,0 ),/* Athlon64 X2 + nvidia */ +SND_PCI_QUIRK (0x1043 ,0x829c ,"ASUS" ,0 ),/* nvidia */ {} };
sound/soc/codecs/tlv320aic23.c +1 -1
@@ -627,7 +627,7 @@ static int tlv320aic23_resume(struct platform_device *pdev)u16 reg;/* Sync reg_cache with the hardware */ -for (reg =0 ; reg <TLV320AIC23_RESET ; reg++) { +for (reg =0 ; reg <=TLV320AIC23_ACTIVE ; reg++) {u16 val =tlv320aic23_read_reg_cache (codec, reg);tlv320aic23_write (codec, reg, val); }
sound/soc/omap/Makefile +1 -1
@@ -25,7 +25,7 @@ obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o -obj-$(CONFIG_SND_OMAP_SOC_OMAP3517EVM) += snd-soc-am3517evm.o +obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o