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

Commit 2bfdd79e 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:
  sound: OSS: mpu401, fix deadlock
  ALSA: hda - Add missing initializations for ALC268 and ALC269
  ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
  ALSA: hda - Line In for Acer Inspire 6530G model
  sound: oxygen: make mic volume control mono
  MAINTAINERS: Add entry for twl4030 series soc codec driver
  ALSA: lx6464es - configure ethersound io channels
  sound: Use PCI_VDEVICE for CREATIVE and ECTIVA
  sound: Use PCI_VDEVICE
  ALSA: hda - Use model=acer-aspire-6530g for Acer Aspire 6930G
  ALSA: hda - Fix acer-aspire-6530g model quirk
  ALSA: hda - Add pin-sense trigger when needed for Realtek codecs
  ALSA: hda - Fix support for Samsung P50 with AD1986A codec
  ALSA: hda - Generalize the pin-detect quirk for Lenovo N100
  ALSA: hda - Simplify AD1986A mixer definitions
parents bb1e9b84 9ea5ca75

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ AD1986A 
  laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100)

  ultra		2-channel with EAPD (Samsung Ultra tablet PC)

  samsung	2-channel with EAPD (Samsung R65)

  samsung-p50	2-channel with HP-automute (Samsung P50)



AD1988/AD1988B/AD1989A/AD1989B

==============================

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -5668,6 +5668,13 @@ F: drivers/misc/tifm* 
F:	drivers/mmc/host/tifm_sd.c

F:	include/linux/tifm.h



TI TWL4030 SERIES SOC CODEC DRIVER

P:	Peter Ujfalusi

M:	peter.ujfalusi@nokia.com

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	sound/soc/codecs/twl4030*



TIPC NETWORK LAYER

P:	Per Liden

M:	per.liden@ericsson.com

sound/isa/cmi8330.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, 
		return -EBUSY;



	acard->mpu = pnp_request_card_device(card, id->devs[2].id, NULL);

	if (acard->play == NULL)

	if (acard->mpu == NULL)

		return -EBUSY;



	pdev = acard->cap;

sound/oss/kahlua.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ MODULE_LICENSE("GPL"); 
 */



static struct pci_device_id id_tbl[] = {

	{ PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	{ PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 },

	{ }

};

sound/oss/mpu401.c

+3 −13
Original line number Diff line number Diff line
@@ -926,31 +926,21 @@ static struct midi_operations mpu401_midi_operations[MAX_MIDI_DEV]; 
static void mpu401_chk_version(int n, struct mpu_config *devc)

{

	int tmp;

	unsigned long flags;



	devc->version = devc->revision = 0;



	spin_lock_irqsave(&devc->lock,flags);

	if ((tmp = mpu_cmd(n, 0xAC, 0)) < 0)

	{

		spin_unlock_irqrestore(&devc->lock,flags);

	tmp = mpu_cmd(n, 0xAC, 0);

	if (tmp < 0)

		return;

	}

	if ((tmp & 0xf0) > 0x20)	/* Why it's larger than 2.x ??? */

	{

		spin_unlock_irqrestore(&devc->lock,flags);

		return;

	}

	devc->version = tmp;



	if ((tmp = mpu_cmd(n, 0xAD, 0)) < 0)

	{

	if ((tmp = mpu_cmd(n, 0xAD, 0)) < 0) {

		devc->version = 0;

		spin_unlock_irqrestore(&devc->lock,flags);

		return;

	}

	devc->revision = tmp;

	spin_unlock_irqrestore(&devc->lock,flags);

}



int attach_mpu401(struct address_info *hw_config, struct module *owner)