From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794046517; b=aN8ffIUXg2xAW7kRFKqIhzihKzPlNID3EfgE0cYJp3CtAJMRMOs/GcMDcO/Sp8Y+0aHp wpPTRh8h4BYPBtM7scLWmJTmADULVo2Bnbtwmz5RAoBRRqLS9cbnit1W1mbLviBo3//eq MS4EmlmlPyi9ieB1zEeOKQ+hJeybzR4HLgA61zU2rnCUAM1v+Z6+PWOaw7BL9QkZh1kO0 xobuUkFkZYABvheEIaZ4dZlrVR9MGLj/vMlISaLceSIlc0eQ4jpbb1ijxeDBWyViQssmk f1XT5Iiw/aPH9Yguu5C8aWLUsYRI6u7GAx2SClPdMihg//8Diodev6DcCL89MQz1gGA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794046517; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=QUbUb4UmwtZ8jnEVA4PXtpPtwmLuhK9U0D3scsu4zzs=; b=W6MymCH3+9xkIbYKVdN7KcHSLG7KPM7XWg2xoDasgxkrorlFks9OVMkQOOMug15epqTm 95Cjk+Mm1qpi18w1QJNCfKUfdJlwDpCUbgU4n0apV3fu+geroHwBQN8BdPHs0STSUfLHT vMArkZbrXwavKYEB7H1aWadBAZ0z+jQToRRS3bMzPstemJJJ6miRAPwVet8iSe/V+ybHi Iw82S8sTzXlELjIN1oO5yRlOlJ2jM2rUKp5vgoJUaKVujsP1GgGrVOD1D8XRmN7vQO1l5 EgVzzqOcXljYK3wRviOw3Ec603QEiWUgC9FGIwyAvGcXIwMS6ErC5PrhWfHTGW9uHsw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=QBhzfsvh; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42B5B606A32C for ; Sat, 7 Nov 2026 10:15:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=QBhzfsvh Received: by smtp.kernel.org (Postfix) with ESMTPSA id B33881F0089F; Sat, 7 Nov 2026 10:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794046517; bh=QUbUb4UmwtZ8jnEVA4PXtpPtwmLuhK9U0D3scsu4zzs=; h=From:To:Cc:Subject:Date; b=QBhzfsvhhQf2fYIpjJMTwo3ip4uUSVJ/Et8sbTBwyYpvVAzpmfYhTDIuPVzR+muKl FyLxuV0VO9Wpmj5nPe6CM8uztza16+PBkZe4xQ3/Sym2IQbsEHc9A92QkeVoZmGpC1 BtrHZ+G9OUKp5QuM05VBa22aNBuVN7eGR8K89J9YNuuvgQrub4Rj4WqI0HTx+BnjaI 5F70T+GgPNi+cPzh0P77bC7b2jBLXTkRrn1S7t/Nkgd5VMc7F5o6UJttgf108oYUXW 7g5grcjqijmDw2SYQMqFeELS04aqfpjlfyf32LQ6+MzCanA7iHwViuxtHsTxngobPw hdQf6hx2QdpKA== From: Sasha Levin To: peter.ujfalusi@linux.intel.com, broonie@kernel.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] ASoC: hdac_hda: Restore the codec device type on unbind" failed to apply to 6.18-stable tree Date: Sat, 7 Nov 2026 05:15:15 -0500 Message-ID: <20261107051515-failed-6.18-08a44bde821d@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x 08a44bde821d4fe22c0b6e63da04b3c59ac243a8 # git commit -s git send-email --to '' --in-reply-to '20261107051515-failed-6.18-08a44bde821d@kernel.org' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 08a44bde821d4fe22c0b6e63da04b3c59ac243a8 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 27 Oct 2026 10:38:39 +0200 Subject: [PATCH] ASoC: hdac_hda: Restore the codec device type on unbind hdac_hda_codec_probe() changes the type of the codec device to HDA_DEV_ASOC to prevent snd_hda_codec_unregister() from unregistering the device when the card is freed. The type is never restored, and hda_bus_match() requires the device and driver types to be equal. After unbinding the codec driver via sysfs the HDA_DEV_LEGACY codec drivers no longer match the device and bind fails with -ENODEV. Restore HDA_DEV_LEGACY with a device managed action registered before the component, so it runs after the component and the card are gone. Fixes: b60ee2e281b6 ("ASoC: hdac_hda: overwrite hdev type to HDA_DEV_ASOC") Cc: stable@vger.kernel.org Signed-off-by: Peter Ujfalusi Link: https://patch.msgid.link/20261027083840.28813-3-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown --- sound/soc/codecs/hdac_hda.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c index 46617fc88277e..cae5711e979c3 100644 --- a/sound/soc/codecs/hdac_hda.c +++ b/sound/soc/codecs/hdac_hda.c @@ -617,6 +617,13 @@ static const struct snd_soc_component_driver hdac_hda_hdmi_codec = { .endianness = 1, }; +static void hdac_hda_restore_dev_type(void *data) +{ + struct hdac_device *hdev = data; + + hdev->type = HDA_DEV_LEGACY; +} + static int hdac_hda_dev_probe(struct hdac_device *hdev) { struct hdac_hda_priv *hda_pvt; @@ -634,6 +641,11 @@ static int hdac_hda_dev_probe(struct hdac_device *hdev) hda_pvt->need_display_power = true; dev_set_drvdata(&hdev->dev, hda_pvt); + /* Allow the legacy codec driver to match again after unbind */ + ret = devm_add_action(&hdev->dev, hdac_hda_restore_dev_type, hdev); + if (ret) + return ret; + /* hold the ref while we probe */ hlink = snd_hdac_ext_bus_get_hlink_by_name(hdev->bus, dev_name(&hdev->dev)); if (!hlink) { -- 2.53.0