summaryrefslogtreecommitdiffstats
path: root/sound/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-03-29 12:29:24 +0200
committerTakashi Iwai <tiwai@suse.de>2016-03-29 12:29:24 +0200
commitfaafd03d23c913633d2ef7e6ffebdce01b164409 (patch)
treefa0d2861950a3090e9f12b845d9776dd9033a1b9 /sound/hda
parent25c0e953eb56168c05fed88fbad00f76e105e2c8 (diff)
downloadblackbird-op-linux-faafd03d23c913633d2ef7e6ffebdce01b164409.tar.gz
blackbird-op-linux-faafd03d23c913633d2ef7e6ffebdce01b164409.zip
ALSA: hda - Clear the leftover component assignment at snd_hdac_i915_exit()
The commit [d745f5e7b8b2: ALSA: hda - Add the pin / port mapping on Intel ILK and VLV] introduced a WARN_ON() to check the pointer for avoiding the double initializations. But hdac_acomp pointer wasn't cleared at snd_hdac_i915_exit(), thus after reloading the HD-audio driver, it may result in the false positive warning. This patch makes sure to clear the leftover pointer at exit. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94736 Reported-by: Daniela Doras-prodan <daniela.doras-prodan@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda')
-rw-r--r--sound/hda/hdac_i915.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 750a4ea49fa9..ae0f305a7e41 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -372,6 +372,7 @@ int snd_hdac_i915_exit(struct hdac_bus *bus)
kfree(acomp);
bus->audio_component = NULL;
+ hdac_acomp = NULL;
return 0;
}
OpenPOWER on IntegriCloud