Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a86b1a2c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/cirrus - Fix the digital beep registration 



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: default avatarTakashi Iwai <tiwai@suse.de>
parent 31b6945a

sound/pci/hda/patch_conexant.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

}
@@ -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;

}
@@ -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;

}
@@ -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.