diff options
| author | Mark Brown <broonie@kernel.org> | 2024-04-29 17:15:57 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-04-29 17:15:57 +0200 |
| commit | 9b4f41684b239eedac96913270db4a5669956671 (patch) | |
| tree | cb9b4800c3d6b93bc4af31fa3e377933c68f9bb2 /sound/soc/sof/amd | |
| parent | ASoC: dt-bindings: fsl,ssi: Convert to YAML (diff) | |
| parent | ASoC: rt715-sdca: volume step modification (diff) | |
| download | linux-9b4f41684b239eedac96913270db4a5669956671.tar.xz linux-9b4f41684b239eedac96913270db4a5669956671.zip | |
ASoC: Merge up fixes
Some new SOF changes depend on the fixes there.
Diffstat (limited to 'sound/soc/sof/amd')
| -rw-r--r-- | sound/soc/sof/amd/acp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index be7dc1e02284..c12c7f820529 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -704,6 +704,10 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev) goto unregister_dev; } + ret = acp_init(sdev); + if (ret < 0) + goto free_smn_dev; + sdev->ipc_irq = pci->irq; ret = request_threaded_irq(sdev->ipc_irq, acp_irq_handler, acp_irq_thread, IRQF_SHARED, "AudioDSP", sdev); @@ -713,10 +717,6 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev) goto free_smn_dev; } - ret = acp_init(sdev); - if (ret < 0) - goto free_ipc_irq; - /* scan SoundWire capabilities exposed by DSDT */ ret = acp_sof_scan_sdw_devices(sdev, chip->sdw_acpi_dev_addr); if (ret < 0) { |