diff options
| author | Mark Brown <broonie@kernel.org> | 2025-09-23 10:28:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-09-23 10:28:45 +0200 |
| commit | fd9814554328e189216bb1488c17157462600e99 (patch) | |
| tree | ef655e32ea0cb4ab6bc3475a947f87736f307adf /sound/soc/sof | |
| parent | 63b4c34635cf32af023796b64c855dd1ed0f0a4f (diff) | |
| parent | 46c8b4d2a693eca69a2191436cffa44f489e98c7 (diff) | |
| download | linux-fd9814554328e189216bb1488c17157462600e99.tar.gz linux-fd9814554328e189216bb1488c17157462600e99.tar.bz2 linux-fd9814554328e189216bb1488c17157462600e99.zip | |
Support reading Subsystem ID from Device Tree
Merge series from Stefan Binding <sbinding@opensource.cirrus.com>:
In PC systems using ACPI, the driver is able to read back an SSID from
the _SUB property. This SSID uniquely identifies the system, which
enables the driver to read the correct firmware and tuning for that
system from linux-firmware. Currently there is no way of reading this
property from device tree. Add an equivalent property in device tree
to perform the same role.
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/imx/imx-common.c | 4 | ||||
| -rw-r--r-- | sound/soc/sof/intel/hda-stream.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/sof/imx/imx-common.c b/sound/soc/sof/imx/imx-common.c index 40debc541bf9..e787d3932fbb 100644 --- a/sound/soc/sof/imx/imx-common.c +++ b/sound/soc/sof/imx/imx-common.c @@ -316,9 +316,9 @@ static int imx_parse_ioremap_memory(struct snd_sof_dev *sdev) } sdev->bar[blk_type] = devm_ioremap_resource(sdev->dev, res); - if (!sdev->bar[blk_type]) + if (IS_ERR(sdev->bar[blk_type])) return dev_err_probe(sdev->dev, - -ENOMEM, + PTR_ERR(sdev->bar[blk_type]), "failed to ioremap %s region\n", chip_info->memory[i].name); } diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c index aa6b0247d5c9..a34f472ef175 100644 --- a/sound/soc/sof/intel/hda-stream.c +++ b/sound/soc/sof/intel/hda-stream.c @@ -890,7 +890,7 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev) if (num_capture >= SOF_HDA_CAPTURE_STREAMS) { dev_err(sdev->dev, "error: too many capture streams %d\n", - num_playback); + num_capture); return -EINVAL; } |