ALSA: hda - Fix yet another i915 pointer leftover in error path
authorTakashi Iwai <tiwai@suse.de>
Tue, 29 Mar 2016 16:48:07 +0000 (18:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 29 Mar 2016 16:48:07 +0000 (18:48 +0200)
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>
sound/hda/hdac_i915.c

index ae0f305a7e4191675675dddc3885d1bdfdab27ca..d0da2508823e97a529a90fcb75f9c9247379cf6f 100644 (file)
@@ -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;