Commit 342e8449 authored by U. Artie Eoff's avatar U. Artie Eoff Committed by Takashi Iwai

ALSA: hda - Fix race between PM ops and HDA init/probe

PM ops could be triggered before HDA is done initializing
and cause PM to set HDA controller to D3Hot.  This can result
in "CORB reset timeout#2, CORBRP = 65535" and "no codecs
initialized".  Additionally, PM ops can be triggered before
azx_probe_continue finishes (async probe).  This can result
in a NULL deref kernel crash.

To fix this, avoid PM ops if !chip->running.
Signed-off-by: default avatarU. Artie Eoff <ullysses.a.eoff@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2d1cb7f6
...@@ -867,7 +867,7 @@ static int azx_suspend(struct device *dev) ...@@ -867,7 +867,7 @@ static int azx_suspend(struct device *dev)
chip = card->private_data; chip = card->private_data;
hda = container_of(chip, struct hda_intel, chip); hda = container_of(chip, struct hda_intel, chip);
if (chip->disabled || hda->init_failed) if (chip->disabled || hda->init_failed || !chip->running)
return 0; return 0;
bus = azx_bus(chip); bus = azx_bus(chip);
...@@ -902,7 +902,7 @@ static int azx_resume(struct device *dev) ...@@ -902,7 +902,7 @@ static int azx_resume(struct device *dev)
chip = card->private_data; chip = card->private_data;
hda = container_of(chip, struct hda_intel, chip); hda = container_of(chip, struct hda_intel, chip);
if (chip->disabled || hda->init_failed) if (chip->disabled || hda->init_failed || !chip->running)
return 0; return 0;
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL
...@@ -1027,7 +1027,7 @@ static int azx_runtime_idle(struct device *dev) ...@@ -1027,7 +1027,7 @@ static int azx_runtime_idle(struct device *dev)
return 0; return 0;
if (!power_save_controller || !azx_has_pm_runtime(chip) || if (!power_save_controller || !azx_has_pm_runtime(chip) ||
azx_bus(chip)->codec_powered) azx_bus(chip)->codec_powered || !chip->running)
return -EBUSY; return -EBUSY;
return 0; return 0;
......
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