From f4154eda4b73118271862201d9dd9b7bedab0c4c Mon Sep 17 00:00:00 2001 From: Yannick Adam Date: Tue, 14 Apr 2020 17:15:09 +0200 Subject: [PATCH] general-fix-es8316-kernel-panic(:1) Original-Subject: [ARCHEOLOGY] Enable es8316 on RockPi4 (#1885) > X-Git-Archeology: - Revision 454038a50d1d24e636626213ad65b3463d632aa0: https://github.com/armbian/build/commit/454038a50d1d24e636626213ad65b3463d632aa0 > X-Git-Archeology: Date: Tue, 14 Apr 2020 17:15:09 +0200 > X-Git-Archeology: From: Yannick Adam > X-Git-Archeology: Subject: Enable es8316 on RockPi4 (#1885) > X-Git-Archeology: > X-Git-Archeology: - Revision bd486c75623e75bdf2bdcaf09dc5a0affe9706c1: https://github.com/armbian/build/commit/bd486c75623e75bdf2bdcaf09dc5a0affe9706c1 > X-Git-Archeology: Date: Tue, 14 Apr 2020 20:14:24 +0200 > X-Git-Archeology: From: Igor Pecovnik > X-Git-Archeology: Subject: Enable es8316 on RockPi4 for Rockchip64 current too https://github.com/armbian/build/pull/1885 > X-Git-Archeology: > X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153 > X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100 > X-Git-Archeology: From: Igor Pecovnik > X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704) > X-Git-Archeology: > X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245 > X-Git-Archeology: Date: Fri, 05 May 2023 14:22:00 +0200 > X-Git-Archeology: From: amazingfate > X-Git-Archeology: Subject: bump rockchip64 edge to v6.3 > X-Git-Archeology: X-Armbian: Patch-File: general-fix-es8316-kernel-panic X-Armbian: Patch-File-Counter: 1 X-Armbian: Patch-Rel-Directory: patch/kernel/archive/rockchip64-6.3 X-Armbian: Patch-Type: kernel X-Armbian: Patch-Root-Type: core X-Armbian: Patch-Sub-Type: common X-Armbian: Original-Subject: [ARCHEOLOGY] Enable es8316 on RockPi4 (#1885) --- sound/soc/codecs/es8316.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c index 056c3082fe02ca..bdb28209677b4f 100644 --- a/sound/soc/codecs/es8316.c +++ b/sound/soc/codecs/es8316.c @@ -696,7 +696,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component) snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE, ES8316_GPIO_ENABLE_INTERRUPT, 0); - if (es8316->jack->status & SND_JACK_MICROPHONE) { + if (es8316->jack && (es8316->jack->status & SND_JACK_MICROPHONE)) { es8316_disable_micbias_for_mic_gnd_short_detect(component); snd_soc_jack_report(es8316->jack, 0, SND_JACK_BTN_0); }