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

Commit f0a221ef authored Oct 03, 2009 by Linus Torvalds

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

* 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (21 commits)
  ALSA: usb - Use strlcat() correctly
  ALSA: Fix invalid __exit in sound/mips/*.c
  ALSA: hda - Fix / improve ALC66x parser
  ALSA: ctxfi: Swapped SURROUND-SIDE mute
  sound: Make keywest_driver static
  ALSA: intel8x0 - Mute External Amplifier by default for Sony VAIO VGN-B1VP
  ALSA: hda - Fix digita/analog mic auto-switching with IDT codecs
  ASoC: fix kconfig order of Blackfin drivers
  ALSA: hda - Added quirk to enable sound on Toshiba NB200
  ASoC: Fix dependency of CONFIG_SND_PXA2XX_SOC_IMOTE2
  ALSA: Don't assume i2c device probing always succeeds
  ALSA: intel8x0 - Mute External Amplifier by default for Sony VAIO VGN-T350P
  ALSA: echoaudio - Re-enable the line-out control for the Mia card
  ALSA: hda - Resurrect input-source mixer of ALC268 model=acer
  ALSA: hda - Analog Devices AD1984A add HP Touchsmart model
  ALSA: hda - Add HP Pavilion dv4t-1300 to MSI whitelist
  ALSA: hda - CD-audio sound for hda-intel conexant benq laptop
  ASoC: DaVinci: Correct McASP FIFO initialization
  ASoC: Davinci: Fix race with cpu_dai->dma_data
  ASoC: DaVinci: Fix divide by zero error during 1st execution
  ...

parents 9117703f 7fa9742b

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -209,6 +209,7 @@ AD1884A / AD1883 / AD1984A / AD1984B
	laptop laptop with HP jack sensing		laptop laptop with HP jack sensing
	mobile mobile devices with HP jack sensing		mobile mobile devices with HP jack sensing
	thinkpad Lenovo Thinkpad X300		thinkpad Lenovo Thinkpad X300
			touchsmart HP Touchsmart

	AD1884		AD1884
	======		======

sound/aoa/codecs/tas.c

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -897,6 +897,15 @@ static int tas_create(struct i2c_adapter *adapter,
	client = i2c_new_device(adapter, &info);		client = i2c_new_device(adapter, &info);
	if (!client)		if (!client)
	return -ENODEV;		return -ENODEV;
			/*
			* We know the driver is already loaded, so the device should be
			* already bound. If not it means binding failed, and then there
			* is no point in keeping the device instantiated.
			*/
			if (!client->driver) {
			i2c_unregister_device(client);
			return -ENODEV;
			}

	/*		/*
	* Let i2c-core delete that device on driver removal.		* Let i2c-core delete that device on driver removal.

sound/mips/hal2.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -915,7 +915,7 @@ static int __devinit hal2_probe(struct platform_device *pdev)
	return 0;		return 0;
	}		}

	static int __exit hal2_remove(struct platform_device *pdev)		static int __devexit hal2_remove(struct platform_device *pdev)
	{		{
	struct snd_card *card = platform_get_drvdata(pdev);		struct snd_card *card = platform_get_drvdata(pdev);

sound/mips/sgio2audio.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -973,7 +973,7 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)
	return 0;		return 0;
	}		}

	static int __exit snd_sgio2audio_remove(struct platform_device *pdev)		static int __devexit snd_sgio2audio_remove(struct platform_device *pdev)
	{		{
	struct snd_card *card = platform_get_drvdata(pdev);		struct snd_card *card = platform_get_drvdata(pdev);

sound/pci/ctxfi/ctatc.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1037,7 +1037,7 @@ static int atc_line_front_unmute(struct ct_atc *atc, unsigned char state)

	static int atc_line_surround_unmute(struct ct_atc *atc, unsigned char state)		static int atc_line_surround_unmute(struct ct_atc *atc, unsigned char state)
	{		{
	return atc_daio_unmute(atc, state, LINEO4);		return atc_daio_unmute(atc, state, LINEO2);
	}		}

	static int atc_line_clfe_unmute(struct ct_atc *atc, unsigned char state)		static int atc_line_clfe_unmute(struct ct_atc *atc, unsigned char state)
	@@ -1047,7 +1047,7 @@ static int atc_line_clfe_unmute(struct ct_atc *atc, unsigned char state)

	static int atc_line_rear_unmute(struct ct_atc *atc, unsigned char state)		static int atc_line_rear_unmute(struct ct_atc *atc, unsigned char state)
	{		{
	return atc_daio_unmute(atc, state, LINEO2);		return atc_daio_unmute(atc, state, LINEO4);
	}		}

	static int atc_line_in_unmute(struct ct_atc *atc, unsigned char state)		static int atc_line_in_unmute(struct ct_atc *atc, unsigned char state)