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

Commit 38c9e91b 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: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
  ALSA: hda - Add quirk for Dell Inspiron 19T using a Conexant CX20582
  ALSA: take tu->qlock with irqs disabled
  ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite P500-PSPGSC-01800T
  ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite Pro T130-15F
  ALSA: hda - fix array indexing while creating inputs for Cirrus codecs
  ALSA: es968: fix wrong PnP dma index
parents 1d7aec30 69b5de84

sound/core/timer.c

+3 −2
Original line number Diff line number Diff line
@@ -1160,6 +1160,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, 
{

	struct snd_timer_user *tu = timeri->callback_data;

	struct snd_timer_tread r1;

	unsigned long flags;



	if (event >= SNDRV_TIMER_EVENT_START &&

	    event <= SNDRV_TIMER_EVENT_PAUSE)
@@ -1169,9 +1170,9 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, 
	r1.event = event;

	r1.tstamp = *tstamp;

	r1.val = resolution;

	spin_lock(&tu->qlock);

	spin_lock_irqsave(&tu->qlock, flags);

	snd_timer_user_append_to_tqueue(tu, &r1);

	spin_unlock(&tu->qlock);

	spin_unlock_irqrestore(&tu->qlock, flags);

	kill_fasync(&tu->fasync, SIGIO, POLL_IN);

	wake_up(&tu->qchange_sleep);

}

sound/isa/sb/es968.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard, 
		return err;

	}

	port[dev] = pnp_port_start(pdev, 0);

	dma8[dev] = pnp_dma(pdev, 1);

	dma8[dev] = pnp_dma(pdev, 0);

	irq[dev] = pnp_irq(pdev, 0);



	return 0;

sound/pci/hda/patch_cirrus.c

+1 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ static int build_input(struct hda_codec *codec) 
		for (n = 0; n < AUTO_PIN_LAST; n++) {

			if (!spec->adc_nid[n])

				continue;

			err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[i]);

			err = snd_hda_add_nid(codec, kctl, 0, spec->adc_nid[n]);

			if (err < 0)

				return err;

		}

sound/pci/hda/patch_conexant.c

+6 −2
Original line number Diff line number Diff line
@@ -1195,9 +1195,10 @@ static int patch_cxt5045(struct hda_codec *codec) 


	switch (codec->subsystem_id >> 16) {

	case 0x103c:

	case 0x1631:

	case 0x1734:

		/* HP & Fujitsu-Siemens laptops have really bad sound over 0dB

		 * on NID 0x17. Fix max PCM level to 0 dB

		/* HP, Packard Bell, & Fujitsu-Siemens laptops have really bad

		 * sound over 0dB on NID 0x17. Fix max PCM level to 0 dB

		 * (originally it has 0x2b steps with 0dB offset 0x14)

		 */

		snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
@@ -2842,6 +2843,9 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
		      CXT5066_DELL_LAPTOP),

	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),

	SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "ideapad", CXT5066_IDEAPAD),

	{}

};