From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 29 Mar 2016 16:48:07 +0000 (+0200)
Subject: ALSA: hda - Fix yet another i915 pointer leftover in error path
X-Git-Tag: v4.4.108~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d126c47656da7ca0c7921eea931e871642c90fb7;p=thirdparty%2Fkernel%2Fstable.git

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

commit 97cc2ed27e5a168cf423f67c3bc7c6cc41d12f82 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=94736
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: Kouta Okamoto <kouta.okamoto@toshiba.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index a90322a71f86b..cce9ae5ec93b7 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -240,6 +240,7 @@ out_master_del:
 out_err:
 	kfree(acomp);
 	bus->audio_component = NULL;
+	hdac_acomp = NULL;
 	dev_info(dev, "failed to add i915 component master (%d)\n", ret);
 
 	return ret;