sound fixes for 2.6.32
Linus,
please pull sound fixes for v2.6.32 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
All commits are small and trivial fixes.
Thanks!
Takashi
===
Dan Carpenter (1):
ALSA: ice1724 - make some bitfields unsigned
Daniel J Blueman (1):
ALSA: hda - Dell Studio 1557 hd-audio quirk
Daniel T Chen (1):
ALSA: hda: Use model=mb5 for MacBookPro 5,2
Takashi Iwai (2):
ALSA: hda - Add another Nvidia HDMI codec id (10de:0005)
ALSA: ice1724 - Fix section mismatch in prodigy_hd2_resume()
--- sound/pci/hda/patch_nvhdmi.c | 2 ++ sound/pci/hda/patch_realtek.c | 5 +++-- sound/pci/hda/patch_sigmatel.c | 2 ++ sound/pci/ice1712/ice1712.h | 4 ++-- sound/pci/ice1712/prodigy_hifi.c | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-)
sound/pci/hda/patch_nvhdmi.c +2 -0
@@ -397,6 +397,7 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec)static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { { .id =0x10de0002 , .name ="MCP78 HDMI" , .patch = patch_nvhdmi_8ch }, { .id =0x10de0003 , .name ="MCP78 HDMI" , .patch = patch_nvhdmi_8ch }, + { .id =0x10de0005 , .name ="MCP78 HDMI" , .patch = patch_nvhdmi_8ch }, { .id =0x10de0006 , .name ="MCP78 HDMI" , .patch = patch_nvhdmi_8ch }, { .id =0x10de0007 , .name ="MCP7A HDMI" , .patch = patch_nvhdmi_8ch }, { .id =0x10de0067 , .name ="MCP67 HDMI" , .patch = patch_nvhdmi_2ch },
@@ -406,6 +407,7 @@ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {MODULE_ALIAS ("snd-hda-codec-id:10de0002" );MODULE_ALIAS ("snd-hda-codec-id:10de0003" ); +MODULE_ALIAS ("snd-hda-codec-id:10de0005" );MODULE_ALIAS ("snd-hda-codec-id:10de0006" );MODULE_ALIAS ("snd-hda-codec-id:10de0007" );MODULE_ALIAS ("snd-hda-codec-id:10de0067" );
sound/pci/hda/patch_realtek.c +3 -2
@@ -8911,10 +8911,11 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = {SND_PCI_QUIRK (0x106b ,0x3800 ,"MacbookPro 4,1" ,ALC885_MBP3 ),SND_PCI_QUIRK (0x106b ,0x3e00 ,"iMac 24 Aluminum" ,ALC885_IMAC24 ),SND_PCI_QUIRK (0x106b ,0x3f00 ,"Macbook 5,1" ,ALC885_MB5 ), -/* FIXME: HP jack sense seems not working for MBP 5,1, so apparently -* no perfect solution yet +/* FIXME: HP jack sense seems not working for MBP 5,1 or 5,2, +* so apparently no perfect solution yet */ SND_PCI_QUIRK (0x106b ,0x4000 ,"MacbookPro 5,1" ,ALC885_MB5 ), + SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5), {} /* terminator */ };
sound/pci/hda/patch_sigmatel.c +2 -0
@@ -1590,6 +1590,8 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { "Dell Studio 17", STAC_DELL_M6_DMIC), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02be, "Dell Studio 1555", STAC_DELL_M6_DMIC), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd, + "Dell Studio 1557", STAC_DELL_M6_DMIC), {}/* terminator */ };
sound/pci/ice1712/ice1712.h +2 -2
@@ -382,8 +382,8 @@ struct snd_ice1712 {#ifdef CONFIG_PM int (*pm_suspend)(struct snd_ice1712 *);int (*pm_resume)(struct snd_ice1712 *); - int pm_suspend_enabled:1; - int pm_saved_is_spdif_master:1; + unsigned int pm_suspend_enabled:1; + unsigned int pm_saved_is_spdif_master:1;unsigned int pm_saved_spdif_ctrl;unsigned char pm_saved_spdif_cfg;unsigned int pm_saved_route;
sound/pci/ice1712/prodigy_hifi.c +1 -1
@@ -1100,7 +1100,7 @@ static void ak4396_init(struct snd_ice1712 *ice) }#ifdef CONFIG_PM -static int __devinit prodigy_hd2_resume (struct snd_ice1712 *ice) +static int prodigy_hd2_resume (struct snd_ice1712 *ice) {/* initialize ak4396 codec and restore previous mixer volumes */ struct prodigy_hifi_spec *spec = ice->spec;