Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8aa1ebd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: ac97_codec - increase timeout for analog sections to 5 second
  ASoC: Correct code taking the size of a pointer
  ALSA: hda - Add PCI IDs for Nvidia G2xx-series
  ALSA: sound/isa/gus: Correct code taking the size of a pointer
  ALSA: hda: Fix max PCM level to 0 dB for AD1981_HP
  ALSA: hda: Use ALC260_WILL quirk for another Acer model (0x1025007f)
parents 8f0ddf91 a9e06057

sound/isa/gus/gus_mem.c

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ static struct snd_gf1_mem_block *snd_gf1_mem_share(struct snd_gf1_mem * alloc, 
	    !share_id[2] && !share_id[3])

		return NULL;

	for (block = alloc->first; block; block = block->next)

		if (!memcmp(share_id, block->share_id, sizeof(share_id)))

		if (!memcmp(share_id, block->share_id,

				sizeof(block->share_id)))

			return block;

	return NULL;

}

sound/pci/ac97/ac97_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template, 
		}

		/* nothing should be in powerdown mode */

		snd_ac97_write_cache(ac97, AC97_GENERAL_PURPOSE, 0);

		end_time = jiffies + msecs_to_jiffies(120);

		end_time = jiffies + msecs_to_jiffies(5000);

		do {

			if ((snd_ac97_read(ac97, AC97_POWERDOWN) & 0x0f) == 0x0f)

				goto __ready_ok;

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -2713,6 +2713,9 @@ static struct pci_device_id azx_ids[] = { 
	{ PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0be2), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0be3), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0be4), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0d94), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0d95), .driver_data = AZX_DRIVER_NVIDIA },

	{ PCI_DEVICE(0x10de, 0x0d96), .driver_data = AZX_DRIVER_NVIDIA },

sound/pci/hda/patch_analog.c

+8 −0
Original line number Diff line number Diff line
@@ -1789,6 +1789,14 @@ static int patch_ad1981(struct hda_codec *codec) 


		codec->patch_ops.init = ad1981_hp_init;

		codec->patch_ops.unsol_event = ad1981_hp_unsol_event;

		/* set the upper-limit for mixer amp to 0dB for avoiding the

		 * possible damage by overloading

		 */

		snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,

					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) |

					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |

					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |

					  (1 << AC_AMPCAP_MUTE_SHIFT));

		break;

	case AD1981_THINKPAD:

		spec->mixers[0] = ad1981_thinkpad_mixers;

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -6248,6 +6248,7 @@ static const char *alc260_models[ALC260_MODEL_LAST] = { 














static struct snd_pci_quirk alc260_cfg_tbl[] = {















	SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),













	SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),















	SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),















	SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),















	SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),