aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-12-06 13:05:29 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:30:33 -0500
commita3bcba384c2f2448ad204ea52baa15f1227d0d40 (patch)
tree9c9afc47758ec6b0a724d2ad1b9cd6fdfefe5cc8 /sound
parentc5f2ea08fbd8911e2c975094780d2b16e65f27e0 (diff)
[ALSA] hda-codec - Fix Oops with ALC260 auto-probe
Modules: HDA Codec driver - Fix Oops with auto-probing of ALC260 with digital I/O - Fix a typo Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_realtek.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 63aeddb731d9..2a6a4804cb92 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2678,6 +2678,9 @@ static struct hda_pcm_stream alc260_pcm_analog_capture = {
2678 .channels_max = 2, 2678 .channels_max = 2,
2679}; 2679};
2680 2680
2681#define alc260_pcm_digital_playback alc880_pcm_digital_playback
2682#define alc260_pcm_digital_capture alc880_pcm_digital_capture
2683
2681/* 2684/*
2682 * for BIOS auto-configuration 2685 * for BIOS auto-configuration
2683 */ 2686 */
@@ -3041,6 +3044,10 @@ static int patch_alc260(struct hda_codec *codec)
3041 spec->stream_analog_playback = &alc260_pcm_analog_playback; 3044 spec->stream_analog_playback = &alc260_pcm_analog_playback;
3042 spec->stream_analog_capture = &alc260_pcm_analog_capture; 3045 spec->stream_analog_capture = &alc260_pcm_analog_capture;
3043 3046
3047 spec->stream_name_digital = "ALC260 Digital";
3048 spec->stream_digital_playback = &alc260_pcm_digital_playback;
3049 spec->stream_digital_capture = &alc260_pcm_digital_capture;
3050
3044 codec->patch_ops = alc_patch_ops; 3051 codec->patch_ops = alc_patch_ops;
3045 if (board_config == ALC260_AUTO) 3052 if (board_config == ALC260_AUTO)
3046 codec->patch_ops.init = alc260_auto_init; 3053 codec->patch_ops.init = alc260_auto_init;
@@ -3927,7 +3934,7 @@ static struct alc_config_preset alc262_presets[] = {
3927 .hp_nid = 0x03, 3934 .hp_nid = 0x03,
3928 .num_channel_mode = ARRAY_SIZE(alc262_modes), 3935 .num_channel_mode = ARRAY_SIZE(alc262_modes),
3929 .channel_mode = alc262_modes, 3936 .channel_mode = alc262_modes,
3930 .input_mux = alc262_capture_source, 3937 .input_mux = &alc262_capture_source,
3931 }, 3938 },
3932}; 3939};
3933 3940