From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 Jan 2011 18:32:54 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: v2.6.38-rc1~236
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66dc918d42eaaa9afe42a47d07526765162017a9;p=thirdparty%2Flinux.git

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: (348 commits)
  ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
  ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
  ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
  ALSA: oxygen: fix Xonar DG input
  ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
  ALSA: hda - Fix missing EAPD for Acer 4930G
  ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
  ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
  ALSA: hda - Don't refer ELD when unplugged
  ASoC: tpa6130a2: Fix compiler warning
  ASoC: tlv320dac33: Add DAPM selection for LOM invert
  ASoC: DMIC codec: Adding a generic DMIC codec
  ALSA: snd-usb-us122l: Fix missing NULL checks
  ALSA: snd-usb-us122l: Fix MIDI output
  ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
  ASoC: Fix section mismatch in wm8995.c
  ALSA: oxygen: add S/PDIF source selection for Claro cards
  ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
  ASoC: fix migor audio build
  ALSA: include delay.h for msleep in Xonar DG support
  ...
---

66dc918d42eaaa9afe42a47d07526765162017a9
diff --cc MAINTAINERS
index 78162c4f9544c,be9c708aac782..3dd5c6fce989d
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5283,20 -5176,8 +5319,20 @@@ SAMSUNG AUDIO (ASoC) DRIVER
  M:	Jassi Brar <jassi.brar@samsung.com>
  L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:	Supported
- F:	sound/soc/s3c24xx
+ F:	sound/soc/samsung
  
 +TIMEKEEPING, NTP
 +M:	John Stultz <johnstul@us.ibm.com>
 +M:	Thomas Gleixner <tglx@linutronix.de>
 +S:	Supported
 +F:	include/linux/clocksource.h
 +F:	include/linux/time.h
 +F:	include/linux/timex.h
 +F:	include/linux/timekeeping.h
 +F:	kernel/time/clocksource.c
 +F:	kernel/time/time*.c
 +F:	kernel/time/ntp.c
 +
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:	Huang Shijie <shijie8@gmail.com>
  M:	Kang Yong <kangyong@telegent.com>
diff --cc drivers/regulator/wm8994-regulator.c
index 594f88eb60c33,21fefef02a43a..35b2958d51064
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@@ -133,10 -136,17 +135,17 @@@ static int wm8994_ldo2_list_voltage(str
  	if (selector > WM8994_LDO2_MAX_SELECTOR)
  		return -EINVAL;
  
- 	return (selector * 100000) + 900000;
+ 	switch (ldo->wm8994->type) {
+ 	case WM8994:
+ 		return (selector * 100000) + 900000;
+ 	case WM8958:
+ 		return (selector * 100000) + 1000000;
+ 	default:
+ 		return -EINVAL;
+ 	}
  }
  
 -static int wm8994_ldo2_get_voltage(struct regulator_dev *rdev)
 +static int wm8994_ldo2_get_voltage_sel(struct regulator_dev *rdev)
  {
  	struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
  	int val;
diff --cc sound/soc/samsung/smdk_spdif.c
index 761e02b4a6e05,cb2f4d04ab7ec..b5c3fad01bb8c
--- a/sound/soc/samsung/smdk_spdif.c
+++ b/sound/soc/samsung/smdk_spdif.c
@@@ -195,17 -193,21 +193,21 @@@ static int __init smdk_init(void
  
  	ret = platform_device_add(smdk_snd_spdif_device);
  	if (ret)
- 		goto err1;
+ 		goto err3;
  
 -	/* Set audio clock heirachy manually */
 +	/* Set audio clock hierarchy manually */
  	ret = set_audio_clock_heirachy(smdk_snd_spdif_device);
  	if (ret)
- 		goto err1;
+ 		goto err4;
  
  	return 0;
- err1:
+ err4:
+ 	platform_device_del(smdk_snd_spdif_device);
+ err3:
  	platform_device_put(smdk_snd_spdif_device);
  err2:
+ 	platform_device_del(smdk_snd_spdif_dit_device);
+ err1:
  	platform_device_put(smdk_snd_spdif_dit_device);
  	return ret;
  }