[ALSA] hda-codec - Fix Oops with ALC260 auto-probe
Takashi Iwai [Tue, 6 Dec 2005 18:05:29 +0000 (19:05 +0100)]
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>

sound/pci/hda/patch_realtek.c

index 63aeddb..2a6a480 100644 (file)
@@ -2678,6 +2678,9 @@ static struct hda_pcm_stream alc260_pcm_analog_capture = {
        .channels_max = 2,
 };
 
+#define alc260_pcm_digital_playback    alc880_pcm_digital_playback
+#define alc260_pcm_digital_capture     alc880_pcm_digital_capture
+
 /*
  * for BIOS auto-configuration
  */
@@ -3041,6 +3044,10 @@ static int patch_alc260(struct hda_codec *codec)
        spec->stream_analog_playback = &alc260_pcm_analog_playback;
        spec->stream_analog_capture = &alc260_pcm_analog_capture;
 
+       spec->stream_name_digital = "ALC260 Digital";
+       spec->stream_digital_playback = &alc260_pcm_digital_playback;
+       spec->stream_digital_capture = &alc260_pcm_digital_capture;
+
        codec->patch_ops = alc_patch_ops;
        if (board_config == ALC260_AUTO)
                codec->patch_ops.init = alc260_auto_init;
@@ -3927,7 +3934,7 @@ static struct alc_config_preset alc262_presets[] = {
                .hp_nid = 0x03,
                .num_channel_mode = ARRAY_SIZE(alc262_modes),
                .channel_mode = alc262_modes,
-               .input_mux = alc262_capture_source,
+               .input_mux = &alc262_capture_source,
        },
 };