]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: SDCA: Always free firmware in FDL path
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Wed, 22 Jul 2026 10:34:58 +0000 (11:34 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 23 Jul 2026 20:10:13 +0000 (21:10 +0100)
In the case a disk firmware exists but is invalid and no SWFT firmware
exists fdl_load_file() will return without calling release_firmware().
Update the code to call this to ensure the firmware is released on the
error path.

Fixes: 71f7990a34cd ("ASoC: SDCA: Add FDL library for XU entities")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://patch.msgid.link/20260722103500.872714-3-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sdca/sdca_fdl.c

index 994821a6df617d9c5d4c32a9ff055b17b88d040f..60fdd406220d4f8617f347ac829230a9aaf1015b 100644 (file)
@@ -258,7 +258,8 @@ static int fdl_load_file(struct sdca_interrupt *interrupt,
 
        if (!swf) {
                dev_err(dev, "failed to locate SWF\n");
-               return -ENOENT;
+               ret = -ENOENT;
+               goto error;
        }
 
        dev_info(dev, "loading SWF: %x-%x-%x\n",
@@ -270,6 +271,8 @@ static int fdl_load_file(struct sdca_interrupt *interrupt,
                                     SDCA_CTL_XU_FDL_MESSAGEOFFSET, fdl_file->fdl_offset,
                                     SDCA_CTL_XU_FDL_MESSAGELENGTH, swf->data,
                                     swf->file_length - offsetof(struct acpi_sw_file, data));
+
+error:
        release_firmware(firmware);
        return ret;
 }