Commit e370a194 authored by Takashi Iwai's avatar Takashi Iwai Committed by Kleber Sacilotto de Souza

ALSA: hda - Fix yet another i915 pointer leftover in error path

BugLink: http://bugs.launchpad.net/bugs/1745054

commit 97cc2ed2 upstream.

The hdac_acomp object in hdac_i915.c is left as assigned even after
binding with i915 actually fails, and this leads to the WARN_ON() at
the next load of the module.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94736Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Cc: Kouta Okamoto <kouta.okamoto@toshiba.co.jp>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 7c2e8496
...@@ -245,6 +245,7 @@ int snd_hdac_i915_init(struct hdac_bus *bus) ...@@ -245,6 +245,7 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
out_err: out_err:
kfree(acomp); kfree(acomp);
bus->audio_component = NULL; bus->audio_component = NULL;
hdac_acomp = NULL;
dev_info(dev, "failed to add i915 component master (%d)\n", ret); dev_info(dev, "failed to add i915 component master (%d)\n", ret);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment