Commit 169d418b authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: emu10k1 - Fix digital/analog switch on audigy2 ZS
  ALSA: hda - Quirk for Acer Aspire 6530G
  ALSA: hda - add another MacBook Pro 3,1 SSID
  ALSA: fix excessive background noise introduced by OSS emulation rate shrink
  ALSA: aw2: do not grab every saa7146 based device
  ALSA: hda - Fix parse of init_verbs sysfs entry
  ALSA: pcxhr.h replace signed one-bit bitfields
parents 70c01f01 1440566f
...@@ -157,7 +157,7 @@ static void resample_shrink(struct snd_pcm_plugin *plugin, ...@@ -157,7 +157,7 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,
while (dst_frames1 > 0) { while (dst_frames1 > 0) {
S1 = S2; S1 = S2;
if (src_frames1-- > 0) { if (src_frames1-- > 0) {
S1 = *src; S2 = *src;
src += src_step; src += src_step;
} }
if (pos & ~R_MASK) { if (pos & ~R_MASK) {
......
...@@ -165,7 +165,7 @@ module_param_array(enable, bool, NULL, 0444); ...@@ -165,7 +165,7 @@ module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard."); MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard.");
static struct pci_device_id snd_aw2_ids[] = { 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, 0, 0},
{0} {0}
}; };
......
...@@ -1528,6 +1528,7 @@ static struct snd_emu_chip_details emu_chip_details[] = { ...@@ -1528,6 +1528,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
.ca0151_chip = 1, .ca0151_chip = 1,
.spk71 = 1, .spk71 = 1,
.spdif_bug = 1, .spdif_bug = 1,
.invert_shared_spdif = 1, /* digital/analog switch swapped */
.ac97_chip = 1} , .ac97_chip = 1} ,
{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102, {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
.driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]", .driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]",
......
...@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev, ...@@ -277,18 +277,19 @@ static ssize_t init_verbs_store(struct device *dev,
{ {
struct snd_hwdep *hwdep = dev_get_drvdata(dev); struct snd_hwdep *hwdep = dev_get_drvdata(dev);
struct hda_codec *codec = hwdep->private_data; struct hda_codec *codec = hwdep->private_data;
char *p; struct hda_verb *v;
struct hda_verb verb, *v; int nid, verb, param;
verb.nid = simple_strtoul(buf, &p, 0); if (sscanf(buf, "%i %i %i", &nid, &verb, &param) != 3)
verb.verb = simple_strtoul(p, &p, 0); return -EINVAL;
verb.param = simple_strtoul(p, &p, 0); if (!nid || !verb)
if (!verb.nid || !verb.verb || !verb.param)
return -EINVAL; return -EINVAL;
v = snd_array_new(&codec->init_verbs); v = snd_array_new(&codec->init_verbs);
if (!v) if (!v)
return -ENOMEM; return -ENOMEM;
*v = verb; v->nid = nid;
v->verb = verb;
v->param = param;
return count; return count;
} }
......
...@@ -7017,6 +7017,7 @@ static int patch_alc882(struct hda_codec *codec) ...@@ -7017,6 +7017,7 @@ static int patch_alc882(struct hda_codec *codec)
case 0x106b3e00: /* iMac 24 Aluminium */ case 0x106b3e00: /* iMac 24 Aluminium */
board_config = ALC885_IMAC24; board_config = ALC885_IMAC24;
break; break;
case 0x106b00a0: /* MacBookPro3,1 - Another revision */
case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */ case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */
case 0x106b00a4: /* MacbookPro4,1 */ case 0x106b00a4: /* MacbookPro4,1 */
case 0x106b2c00: /* Macbook Pro rev3 */ case 0x106b2c00: /* Macbook Pro rev3 */
...@@ -8469,6 +8470,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { ...@@ -8469,6 +8470,8 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = {
ALC888_ACER_ASPIRE_4930G), ALC888_ACER_ASPIRE_4930G),
SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G", SND_PCI_QUIRK(0x1025, 0x015e, "Acer Aspire 6930G",
ALC888_ACER_ASPIRE_4930G), 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(0x1025, 0, "Acer laptop", ALC883_ACER), /* default Acer */
SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL), SND_PCI_QUIRK(0x1028, 0x020d, "Dell Inspiron 530", ALC888_6ST_DELL),
SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG), SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavillion", ALC883_6ST_DIG),
......
...@@ -97,12 +97,12 @@ struct pcxhr_mgr { ...@@ -97,12 +97,12 @@ struct pcxhr_mgr {
int capture_chips; int capture_chips;
int fw_file_set; int fw_file_set;
int firmware_num; int firmware_num;
int is_hr_stereo:1; unsigned int is_hr_stereo:1;
int board_has_aes1:1; /* if 1 board has AES1 plug and SRC */ unsigned 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 */ unsigned int board_has_analog:1; /* if 0 the board is digital only */
int board_has_mic:1; /* if 1 the board has microphone input */ unsigned 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 */ unsigned 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 mono_capture:1; /* if 1 the board does mono capture */
struct snd_dma_buffer hostport; struct snd_dma_buffer hostport;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment