diff options
| author | Takashi Iwai <[email protected]> | 2023-02-16 14:18:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2023-02-16 14:18:54 +0100 |
| commit | 5661706efa200252d0e9fea02421b0a5857808c3 (patch) | |
| tree | b6943001feff0af67c206a850be9c536fe3990b4 /drivers/fpga/intel-m10-bmc-sec-update.c | |
| parent | 5791c7699ff1b8be24e1e3b2c08b180598d3ba28 (diff) | |
| parent | 5beb5627a2481aade9aa630b7ebb7f99442321b6 (diff) | |
Merge branch 'topic/apple-gmux' into for-next
Pull vga_switcheroo fix for Macs
Signed-off-by: Takashi Iwai <[email protected]>
Diffstat (limited to 'drivers/fpga/intel-m10-bmc-sec-update.c')
| -rw-r--r-- | drivers/fpga/intel-m10-bmc-sec-update.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c index 79d48852825e..03f1bd81c434 100644 --- a/drivers/fpga/intel-m10-bmc-sec-update.c +++ b/drivers/fpga/intel-m10-bmc-sec-update.c @@ -574,20 +574,27 @@ static int m10bmc_sec_probe(struct platform_device *pdev) len = scnprintf(buf, SEC_UPDATE_LEN_MAX, "secure-update%d", sec->fw_name_id); sec->fw_name = kmemdup_nul(buf, len, GFP_KERNEL); - if (!sec->fw_name) - return -ENOMEM; + if (!sec->fw_name) { + ret = -ENOMEM; + goto fw_name_fail; + } fwl = firmware_upload_register(THIS_MODULE, sec->dev, sec->fw_name, &m10bmc_ops, sec); if (IS_ERR(fwl)) { dev_err(sec->dev, "Firmware Upload driver failed to start\n"); - kfree(sec->fw_name); - xa_erase(&fw_upload_xa, sec->fw_name_id); - return PTR_ERR(fwl); + ret = PTR_ERR(fwl); + goto fw_uploader_fail; } sec->fwl = fwl; return 0; + +fw_uploader_fail: + kfree(sec->fw_name); +fw_name_fail: + xa_erase(&fw_upload_xa, sec->fw_name_id); + return ret; } static int m10bmc_sec_remove(struct platform_device *pdev) |