Skip to content

remove hda checking from hda_dsp_remove and add it to hda_dsp_trace_init #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Jan 14, 2019
Merged

remove hda checking from hda_dsp_remove and add it to hda_dsp_trace_init #521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,17 +543,14 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)
(struct sof_intel_hda_dev *)sdev->pdata->hw_pdata;
struct hdac_bus *bus = sof_to_bus(sdev);
struct pci_dev *pci = sdev->pci;
const struct sof_intel_dsp_desc *chip = NULL;

if (hda)
chip = hda->desc;
const struct sof_intel_dsp_desc *chip = hda->desc;

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
/* codec removal, invoke bus_device_remove */
snd_hdac_ext_bus_device_remove(bus);
#endif

if (hda && (!IS_ERR_OR_NULL(hda->dmic_dev)))
if (!IS_ERR_OR_NULL(hda->dmic_dev))
platform_device_unregister(hda->dmic_dev);

/* disable DSP IRQ */
Expand Down