diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2006-10-11 18:49:13 +0200 |
|---|---|---|
| committer |   Jaroslav Kysela <perex@suse.cz> | 2006-10-22 10:51:08 +0200 |
| commit | c06134d73cdc02bb8ab1fad180f6da1f28d2e049 (patch) | |
| tree | 72f4a5386551bf06f3113ae20ba98ae0c2047ff7 /sound/pci/hda/patch_realtek.c | |
| parent | [ALSA] sound/isa/opti9xx/opti92x-ad1848.c: check kmalloc() return value (diff) | |
| download | linux-dev-c06134d73cdc02bb8ab1fad180f6da1f28d2e049.tar.xz linux-dev-c06134d73cdc02bb8ab1fad180f6da1f28d2e049.zip | |
[ALSA] hda-codec - Fix assignment of PCM devices for Realtek codecs
Fixed the assignment of PCM devices for Realtek codecs.
The secondary analog capture should be statically asigned to the
third device regardless whether SPDIF exists or not.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to '')
| -rw-r--r-- | 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 84a3eb8aacc2..0d728c6f697c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1799,7 +1799,7 @@ static int alc_build_pcms(struct hda_codec *codec) /* 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) { @@ -1820,7 +1820,7 @@ static int alc_build_pcms(struct hda_codec *codec) 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; |