diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-09-28 08:34:58 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-09-28 08:34:58 +0200 |
| commit | 329bdcbbd229731dc5a8b6753aa2409f00869331 (patch) | |
| tree | cd6d051281f287147967fd5cd9476d4880e3b4fe /sound/soc/sof/imx | |
| parent | fa7d16734f9606c396681648618dd76a5af861e6 (diff) | |
| parent | 9f2c0ac1423d5f267e7f1d1940780fc764b0fee3 (diff) | |
| download | linux-329bdcbbd229731dc5a8b6753aa2409f00869331.tar.gz linux-329bdcbbd229731dc5a8b6753aa2409f00869331.zip | |
Merge branch 'for-linus' into for-next
Pull 6.17-devel branch for applying further changes cleanly.
Signed-off-by: Taksahi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/sof/imx')
| -rw-r--r-- | sound/soc/sof/imx/imx-common.c | 4 |
1 files changed, 2 insertions, 2 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); } |