From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.1 From: kovalev@altlinux.org To: devel-kernel@lists.altlinux.org Date: Thu, 7 Mar 2024 11:50:41 +0300 Message-Id: <20240307085042.497233-2-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240307085042.497233-1-kovalev@altlinux.org> References: <20240307085042.497233-1-kovalev@altlinux.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [d-kernel] [PATCH 1/2] Revert "ASoC: Intel: sof_es8336: add ES8326 component support" X-BeenThere: devel-kernel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux kernel packages development List-Id: ALT Linux kernel packages development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Mar 2024 08:52:16 -0000 Archived-At: List-Archive: List-Post: From: Vasiliy Kovalev This reverts commit 15942fcf7b5fa138e8e7b597f327d252f7895d2c. Remove an outdated ALT patch that leads to null pointer dereference: -- [ 5.784881] RIP: 0010:sof_es8316_exit+0x1b/0x30 [snd_soc_sof_es8336] [ 5.785397] Code: 08 5b c3 cc cc cc cc 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 48 8b 47 10 31 f6 8b 50 18 48 8b 87 18 06 00 00 48 8b 04 d0 31 d2 <48> 8b 78 58 e9 5c ec e6 ff 66 66 2e 0f 1f 84 00 00 00 00 00 90 0f -- [ 5.794869] ? asm_exc_page_fault+0x22/0x30 [ 5.795424] ? sof_es8316_exit+0x1b/0x30 [snd_soc_sof_es8336] [ 5.796205] snd_soc_remove_pcm_runtime+0x16/0x30 [snd_soc_core] [ 5.797141] snd_soc_add_pcm_runtime.cold+0x29/0x10a [snd_soc_core] [ 5.798096] snd_soc_bind_card+0x34c/0xb70 [snd_soc_core] [ 5.798912] ? __kmalloc_node_track_caller+0x4c/0x130 [ 5.799592] ? devm_snd_soc_register_card+0x90/0x90 [snd_soc_core] [ 5.800287] devm_snd_soc_register_card+0x43/0x90 [snd_soc_core] [ 5.800984] sof_es8336_probe.cold+0x968/0x9f1 [snd_soc_sof_es8336] [ 5.801665] platform_probe+0x3c/0xa0 -- [ 5.820537] Signed-off-by: Vasiliy Kovalev name = codec_name; + + /* also fixup codec dai name if relevant */ + if (!strncmp(mach->id, "ESSX8326", SND_ACPI_I2C_ID_LEN)) + dai_links[0].codecs->dai_name = "ES8326 HiFi"; } else { dev_err(dev, "Error cannot find '%s' dev\n", mach->id); return -ENXIO; } - card->components = devm_kasprintf(dev, GFP_KERNEL, "spk:es83%d6", - strstr(codec_name, "ESSX8326") - ? 1 : 2); - if (!card->components) - return -ENOMEM; - codec_dev = acpi_get_first_physical_node(adev); acpi_dev_put(adev); if (!codec_dev) -- 2.33.8