Skip to content

Commit

Permalink
ALSA: hda/cirrus - Fix the digital beep registration
Browse files Browse the repository at this point in the history 
The argument passed to snd_hda_attach_beep_device() is a widget NID
while spec->beep_amp holds the composed value for amp controls.

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Mar 18, 2013
1 parent 31b6945 commit a86b1a2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sound/pci/hda/patch_conexant.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ static int patch_cxt5045(struct hda_codec *codec)
}

if (spec->beep_amp)
snd_hda_attach_beep_device(codec, spec->beep_amp);
snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));

return 0;
}
Expand Down Expand Up @@ -1921,7 +1921,7 @@ static int patch_cxt5051(struct hda_codec *codec)
}

if (spec->beep_amp)
snd_hda_attach_beep_device(codec, spec->beep_amp);
snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));

return 0;
}
Expand Down Expand Up @@ -3099,7 +3099,7 @@ static int patch_cxt5066(struct hda_codec *codec)
}

if (spec->beep_amp)
snd_hda_attach_beep_device(codec, spec->beep_amp);
snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));

return 0;
}
Expand Down Expand Up @@ -3397,7 +3397,7 @@ static int patch_conexant_auto(struct hda_codec *codec)

codec->patch_ops = cx_auto_patch_ops;
if (spec->beep_amp)
snd_hda_attach_beep_device(codec, spec->beep_amp);
snd_hda_attach_beep_device(codec, get_amp_nid_(spec->beep_amp));

/* Some laptops with Conexant chips show stalls in S3 resume,
* which falls into the single-cmd mode.
Expand Down

0 comments on commit a86b1a2

Please sign in to comment.