summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-12-09 09:59:03 +0100
committerTakashi Iwai <tiwai@suse.de>2018-12-11 08:15:45 +0100
commit457f3c86d3358beb0ae19774fef8a9035dedd88f (patch)
tree42556bf31da911f647e539b3909fc53b6244fded /sound/pci
parente454ff8e89b6db0a2054260d48635fbc781e94ce (diff)
ALSA: hda/intel: Properly free the display power at error path
When an error occurs in azx_probe_continue(), we should release the display power. However, the current code ignores it and releases the display power only for HSW/BDW cases. Fix it. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_intel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 663e86effa1f..5399d0180434 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2269,7 +2269,7 @@ static int azx_probe_continue(struct azx *chip)
pm_runtime_put_autosuspend(&pci->dev);
out_free:
- if (!hda->need_i915_power)
+ if (err < 0 || !hda->need_i915_power)
display_power(chip, false);
i915_power_fail: