From 206a469d2876f31f31f28d93c5fac12a91845e33 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 10 Mar 2025 14:22:58 +0100 Subject: [PATCH] 6.6-stable patches added patches: alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch --- ...tek-fix-incorrect-is_reachable-usage.patch | 69 +++++++++++++++++++ queue-6.6/series | 1 + 2 files changed, 70 insertions(+) create mode 100644 queue-6.6/alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch diff --git a/queue-6.6/alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch b/queue-6.6/alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch new file mode 100644 index 0000000000..e982e4c696 --- /dev/null +++ b/queue-6.6/alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch @@ -0,0 +1,69 @@ +From d0bbe332669c5db32c8c92bc967f8e7f8d460ddf Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Tue, 4 Mar 2025 15:25:55 +0100 +Subject: ALSA: hda: realtek: fix incorrect IS_REACHABLE() usage + +From: Arnd Bergmann + +commit d0bbe332669c5db32c8c92bc967f8e7f8d460ddf upstream. + +The alternative path leads to a build error after a recent change: + +sound/pci/hda/patch_realtek.c: In function 'alc233_fixup_lenovo_low_en_micmute_led': +include/linux/stddef.h:9:14: error: called object is not a function or function pointer + 9 | #define NULL ((void *)0) + | ^ +sound/pci/hda/patch_realtek.c:5041:49: note: in expansion of macro 'NULL' + 5041 | #define alc233_fixup_lenovo_line2_mic_hotkey NULL + | ^~~~ +sound/pci/hda/patch_realtek.c:5063:9: note: in expansion of macro 'alc233_fixup_lenovo_line2_mic_hotkey' + 5063 | alc233_fixup_lenovo_line2_mic_hotkey(codec, fix, action); + +Using IS_REACHABLE() is somewhat questionable here anyway since it +leads to the input code not working when the HDA driver is builtin +but input is in a loadable module. Replace this with a hard compile-time +dependency on CONFIG_INPUT. In practice this won't chance much +other than solve the compiler error because it is rare to require +sound output but no input support. + +Fixes: f603b159231b ("ALSA: hda/realtek - add supported Mic Mute LED for Lenovo platform") +Signed-off-by: Arnd Bergmann +Link: https://patch.msgid.link/20250304142620.582191-1-arnd@kernel.org +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/pci/hda/Kconfig | 1 + + sound/pci/hda/patch_realtek.c | 5 ----- + 2 files changed, 1 insertion(+), 5 deletions(-) + +--- a/sound/pci/hda/Kconfig ++++ b/sound/pci/hda/Kconfig +@@ -183,6 +183,7 @@ comment "Set to Y if you want auto-loadi + + config SND_HDA_CODEC_REALTEK + tristate "Build Realtek HD-audio codec support" ++ depends on INPUT + select SND_HDA_GENERIC + select SND_HDA_GENERIC_LEDS + help +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4865,7 +4865,6 @@ static void alc298_fixup_samsung_amp(str + } + } + +-#if IS_REACHABLE(CONFIG_INPUT) + static void gpio2_mic_hotkey_event(struct hda_codec *codec, + struct hda_jack_callback *event) + { +@@ -4974,10 +4973,6 @@ static void alc233_fixup_lenovo_line2_mi + spec->kb_dev = NULL; + } + } +-#else /* INPUT */ +-#define alc280_fixup_hp_gpio2_mic_hotkey NULL +-#define alc233_fixup_lenovo_line2_mic_hotkey NULL +-#endif /* INPUT */ + + static void alc269_fixup_hp_line1_mic1_led(struct hda_codec *codec, + const struct hda_fixup *fix, int action) diff --git a/queue-6.6/series b/queue-6.6/series index ad4d2ea4c4..1717b281fb 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -128,3 +128,4 @@ iio-adc-at91-sama5d2_adc-fix-sama7g5-realbits-value.patch mm-hugetlb-add-huge-page-size-param-to-huge_ptep_get_and_clear.patch arm64-hugetlb-fix-huge_ptep_get_and_clear-for-non-present-ptes.patch kbuild-hdrcheck-fix-cross-build-with-clang.patch +alsa-hda-realtek-fix-incorrect-is_reachable-usage.patch -- 2.47.2