mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 11:28:32 +00:00
Merge branch 'for-linus' into for-next
This commit is contained in:
commit
a72f659549
2 changed files with 9 additions and 2 deletions
|
@ -958,6 +958,7 @@ static int patch_conexant_auto(struct hda_codec *codec)
|
|||
*/
|
||||
|
||||
static const struct hda_device_id snd_hda_id_conexant[] = {
|
||||
HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f15045, "CX20549 (Venice)", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f15047, "CX20551 (Waikiki)", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f15051, "CX20561 (Hermosa)", patch_conexant_auto),
|
||||
|
@ -975,9 +976,9 @@ static const struct hda_device_id snd_hda_id_conexant[] = {
|
|||
HDA_CODEC_ENTRY(0x14f150ac, "CX20652", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f150b8, "CX20664", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f150b9, "CX20665", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f150f1, "CX20721", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f150f1, "CX21722", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f150f2, "CX20722", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f150f3, "CX20723", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f150f3, "CX21724", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f150f4, "CX20724", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f1510f, "CX20751/2", patch_conexant_auto),
|
||||
HDA_CODEC_ENTRY(0x14f15110, "CX20751/2", patch_conexant_auto),
|
||||
|
|
|
@ -2352,6 +2352,12 @@ static void intel_pin_eld_notify(void *audio_ptr, int port)
|
|||
struct hda_codec *codec = audio_ptr;
|
||||
int pin_nid = port + 0x04;
|
||||
|
||||
/* skip notification during system suspend (but not in runtime PM);
|
||||
* the state will be updated at resume
|
||||
*/
|
||||
if (snd_power_get_state(codec->card) != SNDRV_CTL_POWER_D0)
|
||||
return;
|
||||
|
||||
check_presence_and_report(codec, pin_nid);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue