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: (250 commits)
  [ALSA] ice1724 - Fix IRQ lock-up with MPU access
  [ALSA] Define MPU401 registers in sound/mpu401_uart.h
  [ALSA] pcsp: fix wording in DEBUG_PAGEALLOC warning
  [ALSA] pcsp - Fix dependency in Kconfig
  [ALSA] soc - ac97 - Clean up checkpatch warnings
  [ALSA] soc - wm8750 - Clean up checkpatch warnings
  [ALSA] soc - wm8731 - Clean up checkpatch warnings
  [ALSA] soc - pxa2xx-pcm - Fix checkpatch warnings
  [ALSA] soc - spitz - Fix checkpatch warnings
  [ALSA] soc - poodle - Fix checkpatch warnings
  [ALSA] soc - corgi - Fix checkpatch warnings
  [ALSA] soc - s3c24xx-i2s - Add missing spaces
  [ALSA] soc - s3c24xx-i2s - Fix tab/space breakage
  [ALSA] soc - s3c24xx-i2s - Use linux/io.h
  [ALSA] hda - Fix Thinkpad X300 digital mic
  pcsp - Don't build pcspkr when snd-pcsp is enabled
  [ALSA] hda - Fix model for Acer Aspire 5720z
  [ALSA] soc - s3c24xx - Declare suspend and resume static
  [ALSA] soc - s3c24xx - Improve diagnostic output
  [ALSA] Fix possible races at free_irq in PCI drivers
  ...

1 files changed, 11 insertions, 2 deletions

diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index 3d6097ba1d6..c73ce074a6e 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -28,6 +28,7 @@
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_patch.h"
 #define NUM_PINS	11
 
 
@@ -329,6 +330,11 @@ static int cmi9880_build_controls(struct hda_codec *codec)
 		err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);
 		if (err < 0)
 			return err;
+		err = snd_hda_create_spdif_share_sw(codec,
+						    &spec->multiout);
+		if (err < 0)
+			return err;
+		spec->multiout.share_spdif = 1;
 	}
 	if (spec->dig_in_nid) {
 		err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
@@ -432,7 +438,8 @@ static int cmi9880_playback_pcm_open(struct hda_pcm_stream *hinfo,
 				     struct snd_pcm_substream *substream)
 {
 	struct cmi_spec *spec = codec->spec;
-	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
+	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream,
+					     hinfo);
 }
 
 static int cmi9880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
@@ -506,7 +513,7 @@ static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
 {
 	struct cmi_spec *spec = codec->spec;
 
-	snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], 0, 0, 0);
+	snd_hda_codec_cleanup_stream(codec, spec->adc_nids[substream->number]);
 	return 0;
 }
 
@@ -571,6 +578,7 @@ static int cmi9880_build_pcms(struct hda_codec *codec)
 		codec->num_pcms++;
 		info++;
 		info->name = "CMI9880 Digital";
+		info->pcm_type = HDA_PCM_TYPE_SPDIF;
 		if (spec->multiout.dig_out_nid) {
 			info->stream[SNDRV_PCM_STREAM_PLAYBACK] = cmi9880_pcm_digital_playback;
 			info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
@@ -603,6 +611,7 @@ static const char *cmi9880_models[CMI_MODELS] = {
 
 static struct snd_pci_quirk cmi9880_cfg_tbl[] = {
 	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", CMI_FULL_DIG),
+	SND_PCI_QUIRK(0x1854, 0x0032, "LG", CMI_FULL_DIG),
 	{} /* terminator */
 };