The setup of unsolicited event callbacks should be done only once at the parser phase, not in the init phase that is called multiple times at each resume.

This patch moves the unsol setup code in ca0132 codec driver to the more appropriate place.

Reported-by: Hui Wang hui.wang@canonical.com Signed-off-by: Takashi Iwai tiwai@suse.de --- sound/pci/hda/patch_ca0132.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 9779978e4bc7..2e3ae9975946 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -8538,7 +8538,7 @@ static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb) ca0132_select_mic(codec); }

-static void ca0132_init_unsol(struct hda_codec *codec) +static void ca0132_setup_unsol(struct hda_codec *codec) { struct ca0132_spec *spec = codec->spec; snd_hda_jack_detect_enable_callback(codec, spec->unsol_tag_hp, hp_callback); @@ -9368,7 +9368,6 @@ static int ca0132_init(struct hda_codec *codec) if (ca0132_quirk(spec) == QUIRK_AE5 || ca0132_quirk(spec) == QUIRK_AE7) ae5_register_set(codec);

- ca0132_init_unsol(codec); ca0132_init_params(codec); ca0132_init_flags(codec);

@@ -9933,6 +9932,8 @@ static int patch_ca0132(struct hda_codec *codec) if (err < 0) goto error;

+ ca0132_setup_unsol(codec); + return 0;

error: