summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_codec.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2023-02-16 17:06:18 +0300
committerTakashi Iwai <tiwai@suse.de>2023-02-16 17:06:18 +0300
commit7933b90b42896f5b6596e6a829bb31c5121fc2a9 (patch)
treebab4d4fee7ce8199416d0666739052811c593089 /sound/pci/hda/hda_codec.c
parent1bdb78368f9448cf0de9b11eb1388e887d1b4849 (diff)
parent82f1627cb6339ee32db22c89c750c0e359e5c72e (diff)
downloadlinux-7933b90b42896f5b6596e6a829bb31c5121fc2a9.tar.xz
Merge branch 'for-linus' into for-next
Pull the pending fixes for 6.3 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index dc4a042b3ac1..9f79c0ac2bda 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -927,7 +927,6 @@ snd_hda_codec_device_init(struct hda_bus *bus, unsigned int codec_addr,
codec->depop_delay = -1;
codec->fixup_id = HDA_FIXUP_ID_NOT_SET;
codec->core.dev.release = snd_hda_codec_dev_release;
- codec->core.exec_verb = codec_exec_verb;
codec->core.type = HDA_DEV_LEGACY;
mutex_init(&codec->spdif_mutex);
@@ -998,6 +997,7 @@ int snd_hda_codec_device_new(struct hda_bus *bus, struct snd_card *card,
if (snd_BUG_ON(codec_addr > HDA_MAX_CODEC_ADDRESS))
return -EINVAL;
+ codec->core.exec_verb = codec_exec_verb;
codec->card = card;
codec->addr = codec_addr;