[PATCH] [UBUNTU:sound/pci/hda/] Fix PCM device assignment for Realtek HDA codecs

[crimsun at fungus.sh.nu]

From e69ca2bd47131ab7c46e89e59c168f31e96b2b54 Mon Sep 17 00:00:00 2001
From: Daniel T. Chen <crimsun at garnish.localdomain>
Date: Wed, 11 Oct 2006 22:28:53 -0400
Subject: [PATCH] [UBUNTU:sound/pci/hda/] Fix PCM device assignment for Realtek HDA codecs

UpstreamStatus: Added in upstream alsa-kernel hg changeset:
		e51177a60747 [http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=e51177a60747522a60bc1599aa5b2db22d4770a4;style=raw]

This patch from Takashi Iwai corrects a previous commit where the
secondary analog capture was mistakenly assigned depending on the
existence of S/PDIF for Realtek HDA codecs.

This commit is applicable to both Dapper and Edgy linux-source.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
---
 sound/pci/hda/patch_realtek.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index ddd4ff0..f4ccc19 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1769,7 +1769,7 @@ static int alc_build_pcms(struct hda_cod
 	/* SPDIF for stream index #1 */
 	if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
 		codec->num_pcms = 2;
-		info++;
+		info = spec->pcm_rec + 1;
 		info->name = spec->stream_name_digital;
 		if (spec->multiout.dig_out_nid &&
 		    spec->stream_digital_playback) {
@@ -1790,7 +1790,7 @@ static int alc_build_pcms(struct hda_cod
 	if (spec->num_adc_nids > 1 && spec->stream_analog_capture &&
 	    spec->adc_nids) {
 		codec->num_pcms = 3;
-		info++;
+		info = spec->pcm_rec + 2;
 		info->name = spec->stream_name_analog;
 		/* No playback stream for second PCM */
 		info->stream[SNDRV_PCM_STREAM_PLAYBACK] = alc_pcm_null_playback;
-- 
1.4.1

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:  0xC88ABDA3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20061011/12f48c1b/attachment.sig>