diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-29 18:48:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-29 18:48:07 +0200 |
| commit | 97cc2ed27e5a168cf423f67c3bc7c6cc41d12f82 (patch) | |
| tree | 1fb32a8c9ab537f39eef2711e696a721f945d930 /sound | |
| parent | faafd03d23c913633d2ef7e6ffebdce01b164409 (diff) | |
| download | linux-97cc2ed27e5a168cf423f67c3bc7c6cc41d12f82.tar.bz2 | |
ALSA: hda - Fix yet another i915 pointer leftover in error path
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/hda/hdac_i915.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index ae0f305a7e41..d0da2508823e 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -339,6 +339,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; |