diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-22 16:40:24 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-22 16:48:17 +0200 |
| commit | 8a5354140a86b6d4057793a9ed28d29ac8ce6ba6 (patch) | |
| tree | c8f8dc2e4ff1df1c47db26b61083c4379c0886a9 /sound/pci/hda/hda_codec.c | |
| parent | f9933487468c760b8cd9b4e9f7ec4e494f711a0a (diff) | |
| download | talos-op-linux-8a5354140a86b6d4057793a9ed28d29ac8ce6ba6.tar.gz talos-op-linux-8a5354140a86b6d4057793a9ed28d29ac8ce6ba6.zip | |
ALSA: hda - Call snd_hda_jack_report_sync() generically in hda_codec.c
Instead of calling the jack sync in the init callback of each codec,
call it generically at initialization and resume. By calling it at
the last of resume sequence, a possible race between the jack sync and
the unsol event enablement in the current code will be closed, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index a6c34dc6dac1..4efd2711acd9 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3618,6 +3618,7 @@ static void hda_call_codec_resume(struct hda_codec *codec) snd_hda_codec_resume_amp(codec); snd_hda_codec_resume_cache(codec); } + snd_hda_jack_report_sync(codec); snd_hda_power_down(codec); /* flag down before returning */ } #endif /* CONFIG_PM */ @@ -3663,6 +3664,7 @@ int snd_hda_codec_build_controls(struct hda_codec *codec) err = codec->patch_ops.build_controls(codec); if (err < 0) return err; + snd_hda_jack_report_sync(codec); /* call at the last init point */ return 0; } |
