Skip to content

Commit

Permalink
ALSA: hda - Disable the sanity check in snd_hda_add_pincfg()
Browse files Browse the repository at this point in the history
When pin default configs are overridden via patch option, these are
evaluated before fixups are applied.  Since some fixups change the
whole codec trees and/or add pins dynamically, this sanity check might
not pass when pins aren't present at the time the function is called.

We may reorder the execution, but an easier fix is simply to disable
this sanity check.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Apr 18, 2013
1 parent 6134b1a commit d5657ec
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions sound/pci/hda/hda_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1065,8 +1065,14 @@ int snd_hda_add_pincfg(struct hda_codec *codec, struct snd_array *list,
{
struct hda_pincfg *pin;

/* the check below may be invalid when pins are added by a fixup
* dynamically (e.g. via snd_hda_codec_update_widgets()), so disabled
* for now
*/
/*
if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN)
return -EINVAL;
*/

pin = look_up_pincfg(codec, list, nid);
if (!pin) {
Expand Down

0 comments on commit d5657ec

Please sign in to comment.