Skip to content

Commit

Permalink
[ALSA] hda-codec - Fix ALC codec probing
Browse files Browse the repository at this point in the history
Modules: HDA Codec driver

- Fix ALC882 BIOS auto-probe
- Fix ALC262 basic model
- Add assert for debugging Oops

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jan 3, 2006
1 parent a8ee729 commit c5f2ea0
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,8 @@ static int alc_build_pcms(struct hda_codec *codec)
codec->num_pcms = 1;
codec->pcm_info = info;

snd_assert(spec->stream_analog_playback, return -EINVAL);
snd_assert(spec->stream_analog_capture, return -EINVAL);
info->name = spec->stream_name_analog;
info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_analog_playback);
info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0];
Expand All @@ -1277,10 +1279,12 @@ static int alc_build_pcms(struct hda_codec *codec)
info++;
info->name = spec->stream_name_digital;
if (spec->multiout.dig_out_nid) {
snd_assert(spec->stream_digital_playback, return -EINVAL);
info->stream[SNDRV_PCM_STREAM_PLAYBACK] = *(spec->stream_digital_playback);
info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid;
}
if (spec->dig_in_nid) {
snd_assert(spec->stream_digital_capture, return -EINVAL);
info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_digital_capture);
info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
}
Expand Down Expand Up @@ -3508,9 +3512,10 @@ static int alc882_parse_auto_config(struct hda_codec *codec)

if (err < 0)
return err;
/* hack - override the init verbs */
spec->init_verbs[0] = alc882_auto_init_verbs;
return 0;
else if (err > 0)
/* hack - override the init verbs */
spec->init_verbs[0] = alc882_auto_init_verbs;
return err;
}

/* init callback for auto-configuration model -- overriding the default init */
Expand Down Expand Up @@ -3605,6 +3610,7 @@ static int patch_alc882(struct hda_codec *codec)
#define alc262_adc_nids_alt alc882_adc_nids_alt

#define alc262_modes alc260_modes
#define alc262_capture_source alc882_capture_source

static struct snd_kcontrol_new alc262_base_mixer[] = {
HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
Expand Down Expand Up @@ -3921,6 +3927,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,
},
};

Expand Down

0 comments on commit c5f2ea0

Please sign in to comment.