ALSA fixes for 2.6.29-rc6
Linus,
please pull ALSA fixes for v2.6.29-rc6 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
containing the following trivial fixes.
Thanks!
Takashi
==
Anssi Hannula (1):
ALSA: aw2: do not grab every saa7146 based device
Harvey Harrison (1):
ALSA: pcxhr.h replace signed one-bit bitfields
Juan Jesus Garcia de Soria (1):
ALSA: hda - Quirk for Acer Aspire 6530G
Luke Yelavich (1):
ALSA: hda - add another MacBook Pro 3,1 SSID
Steve Chen (1):
ALSA: fix excessive background noise introduced by OSS emulation rate shrink
Takashi Iwai (2):
ALSA: hda - Fix parse of init_verbs sysfs entry
ALSA: emu10k1 - Fix digital/analog switch on audigy2 ZS
--- sound/core/oss/rate.c | 2 +- sound/pci/aw2/aw2-alsa.c | 2 +- sound/pci/emu10k1/emu10k1_main.c | 1 + sound/pci/hda/hda_hwdep.c | 15 ++++++++------- sound/pci/hda/patch_realtek.c | 3 +++ sound/pci/pcxhr/pcxhr.h | 12 ++++++------ 6 files changed, 20 insertions(+), 15 deletions(-)
sound/core/oss/rate.c +1 -1
@@ -157,7 +157,7 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,while (dst_frames1 >0 ) {S1 =S2 ;if (src_frames1-- >0 ) { -S1 = *src; +S2 = *src; src += src_step; }if (pos & ~R_MASK ) {
sound/pci/aw2/aw2-alsa.c +1 -1
@@ -165,7 +165,7 @@ module_param_array(enable, bool, NULL, 0444);MODULE_PARM_DESC (enable,"Enable Audiowerk2 soundcard." );static struct pci_device_id snd_aw2_ids[] = { - {PCI_VENDOR_ID_SAA7146 ,PCI_DEVICE_ID_SAA7146 ,PCI_ANY_ID ,PCI_ANY_ID , + {PCI_VENDOR_ID_SAA7146 ,PCI_DEVICE_ID_SAA7146 ,0 ,0 ,0 ,0 ,0 }, {0 } };
sound/pci/emu10k1/emu10k1_main.c +1 -0
@@ -1528,6 +1528,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { .ca0151_chip = 1, .spk71 = 1, .spdif_bug = 1, + .invert_shared_spdif = 1, /* digital/analog switch swapped */ .ac97_chip = 1} , {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102, .driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]",
sound/pci/hda/hda_hwdep.c +8 -7
@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev, {struct snd_hwdep *hwdep =dev_get_drvdata (dev);struct hda_codec *codec = hwdep->private_data; -char *p; -struct hda_verb verb, *v; +struct hda_verb *v; +int nid, verb, param; - verb.nid =simple_strtoul (buf, &p,0 ); - verb.verb =simple_strtoul (p, &p,0 ); - verb.param =simple_strtoul (p, &p,0 ); -if (!verb.nid || !verb.verb || !verb.param) +if (sscanf (buf,"%i %i %i" , &nid, &verb, ¶m) !=3 ) +return -EINVAL ; +if (!nid || !verb)return -EINVAL ; v =snd_array_new (&codec->init_verbs);if (!v)return -ENOMEM ; - *v = verb; + v->nid = nid; + v->verb = verb; + v->param = param;return count; }
sound/pci/hda/patch_realtek.c +3 -0
@@ -7017,6 +7017,7 @@ static int patch_alc882(struct hda_codec *codec)case 0x106b3e00 :/* iMac 24 Aluminium */ board_config =ALC885_IMAC24 ;break ; +case 0x106b00a0 :/* MacBookPro3,1 - Another revision */ case 0x106b00a1 :/* Macbook (might be wrong - PCI SSID?) */ case 0x106b00a4 :/* MacbookPro4,1 */ case 0x106b2c00 :/* Macbook Pro rev3 */
@@ -8469,6 +8470,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { ALC888_ACER_ASPIRE_4930G),SND_PCI_QUIRK (0x1025 ,0x015e ,"Acer Aspire 6930G" ,ALC888_ACER_ASPIRE_4930G ), +SND_PCI_QUIRK (0x1025 ,0x0166 ,"Acer Aspire 6530G" , +ALC888_ACER_ASPIRE_4930G ),SND_PCI_QUIRK (0x1025 ,0 ,"Acer laptop" ,ALC883_ACER ),/* default Acer */ SND_PCI_QUIRK (0x1028 ,0x020d ,"Dell Inspiron 530" ,ALC888_6ST_DELL ), SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
sound/pci/pcxhr/pcxhr.h +6 -6
@@ -97,12 +97,12 @@ struct pcxhr_mgr {int capture_chips;int fw_file_set;int firmware_num; - int is_hr_stereo:1; - int board_has_aes1:1; /* if 1 board has AES1 plug and SRC */ - int board_has_analog:1; /* if 0 the board is digital only */ - int board_has_mic:1; /* if 1 the board has microphone input */ - int board_aes_in_192k:1;/* if 1 the aes input plugs do support 192kHz */ - int mono_capture:1; /* if 1 the board does mono capture */ + unsigned int is_hr_stereo:1; + unsigned int board_has_aes1:1; /* if 1 board has AES1 plug and SRC */ + unsigned int board_has_analog:1; /* if 0 the board is digital only */ + unsigned int board_has_mic:1; /* if 1 the board has microphone input */ + unsigned int board_aes_in_192k:1;/* if 1 the aes input plugs do support 192kHz */ + unsigned int mono_capture:1; /* if 1 the board does mono capture */struct snd_dma_buffer hostport;
Did this address
http://bugzilla.kernel.org/show_bug.cgi?id=12735
or is that still pending? I realize that there is a hack around it, but that hack isn't actually appropriate for a distro kernel, so..
Linus
At Sat, 28 Feb 2009 09:30:28 -0800 (PST),
Quoted 8 lines · Linus Torvalds
Did this address
http://bugzilla.kernel.org/show_bug.cgi?id=12735or is that still pending? I realize that there is a hack around it, but that hack isn't actually appropriate for a distro kernel, so..
No, the problem is still pending (although likely already solved in the latest sound git tree).
On 2.6.29, we had to enable the 4th codec slot for HDMI devices, but this resulted in conflicts on some machines. In the latest code, the HDMI device is better managed and the conflict is mostly resolved. But this fix needs underlying framework changes, thus applying it 2.6.29 will drag too many changes.
A temporary fix for 2.6.29 would be to add the default probe_mask option value for this particular device (by checking PCI SSID). Once after I get the h/w information, I'll send the pull request soon.
thanks,
Takashi