Commit 37c4fd0d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: Do disconnect jacks at codec unbind 

The HD-audio codec driver remove may happen also at dynamically
unbinding during operation, hence it needs manual triggers of
snd_device_disconnect() calls, while it's missing for the jack objects
that are associated with the codec.

This patch adds the manual disconnection call for jacks when the
remove happens without card->shutdown (i.e. not under the full
removal).

Link: https://lore.kernel.org/r/20211117133040.20272-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2c95b92e

sound/pci/hda/hda_bind.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <sound/core.h>

#include <sound/hda_codec.h>

#include "hda_local.h"

#include "hda_jack.h"



/*

 * find a matching codec id
@@ -158,6 +159,7 @@ static int hda_codec_driver_remove(struct device *dev) 


	refcount_dec(&codec->pcm_ref);

	snd_hda_codec_disconnect_pcms(codec);

	snd_hda_jack_tbl_disconnect(codec);

	wait_event(codec->remove_sleep, !refcount_read(&codec->pcm_ref));

	snd_power_sync_ref(codec->bus->card);

sound/pci/hda/hda_jack.c

+11 −0
Original line number Diff line number Diff line
@@ -158,6 +158,17 @@ snd_hda_jack_tbl_new(struct hda_codec *codec, hda_nid_t nid, int dev_id) 
	return jack;

}



void snd_hda_jack_tbl_disconnect(struct hda_codec *codec)

{

	struct hda_jack_tbl *jack = codec->jacktbl.list;

	int i;



	for (i = 0; i < codec->jacktbl.used; i++, jack++) {

		if (!codec->bus->shutdown && jack->jack)

			snd_device_disconnect(codec->card, jack->jack);

	}

}



void snd_hda_jack_tbl_clear(struct hda_codec *codec)

{

	struct hda_jack_tbl *jack = codec->jacktbl.list;

sound/pci/hda/hda_jack.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct hda_jack_tbl * 
snd_hda_jack_tbl_get_from_tag(struct hda_codec *codec,

			      unsigned char tag, int dev_id);



void snd_hda_jack_tbl_disconnect(struct hda_codec *codec);

void snd_hda_jack_tbl_clear(struct hda_codec *codec);



void snd_hda_jack_set_dirty_all(struct hda_codec *codec);