[Intel-gfx] [PATCH v3] NOTFORUPSTREAM sound/hda: add debug information in call_hp_automute
Martin Peres
martin.peres at linux.intel.com
Fri Jun 9 10:57:48 UTC 2017
I would like to send this patch to the core-for-CI branch, in order to
verify the theory I exposed in fdo#101246.
This patch also hides a potentially serious bug in the sound/hda
driver, which may improve our chances of not being affected by
bugs there. It may actually also fix some of the incompletes we see.
v2: use WARN() instead of printk with a custom string
v3: return if spec is NULL (was a typo from v2
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101246
---
Sorry, I fixed the typos introduced in the v2.
Note to self: Do not send patches right before leaving for a meeting.
sound/pci/hda/hda_generic.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 557ecfcad158..4ac24a4f2e70 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -4471,7 +4471,15 @@ EXPORT_SYMBOL_GPL(snd_hda_gen_mic_autoswitch);
static void call_hp_automute(struct hda_codec *codec,
struct hda_jack_callback *jack)
{
- struct hda_gen_spec *spec = codec->spec;
+ struct hda_gen_spec *spec;
+
+ if (WARN(!codec, "call_hp_automute called with codec == NULL"))
+ return;
+
+ spec = codec->spec;
+ if (WARN(!spec, "call_hp_automute called with codec->spec == NULL"))
+ return;
+
if (spec->hp_automute_hook)
spec->hp_automute_hook(codec, jack);
else
--
2.13.1
More information about the Intel-gfx
mailing list