summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRobin van der Gracht <robin@protonic.nl>2022-06-16 15:11:09 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2022-06-17 09:07:57 +0200
commit504b92ea16a8f2de3717e18ac184229cb82528f3 (patch)
tree6add8e5b265dc71fc6149f3c1f470eac3143e1c3 /arch
parent022b5e6f2dbef2e331e4a4e375261af7e9da5889 (diff)
downloadbarebox-504b92ea16a8f2de3717e18ac184229cb82528f3.tar.gz
barebox-504b92ea16a8f2de3717e18ac184229cb82528f3.tar.xz
ARM: boards: protonic-imx6: Always free allocated alias string
The memory required to store the string needs to be freed on success as well since it's no longer used. Signed-off-by: Robin van der Gracht <robin@protonic.nl> Link: https://lore.barebox.org/20220616131114.214628-5-robin@protonic.nl Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/protonic-imx6/board.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c
index 55589378db..604a47ae5b 100644
--- a/arch/arm/boards/protonic-imx6/board.c
+++ b/arch/arm/boards/protonic-imx6/board.c
@@ -681,24 +681,22 @@ static int prt_imx6_rfid_fixup(struct prt_imx6_priv *priv,
}
i2c_node = of_find_node_by_alias(root, alias);
+ kfree(alias);
if (!i2c_node) {
dev_err(priv->dev, "Unsupported i2c adapter\n");
- ret = -ENODEV;
- goto free_alias;
+ return -ENODEV;
}
eeprom_node_name = basprintf("/eeprom@%x", dcfg->i2c_addr);
if (!eeprom_node_name) {
- ret = -ENOMEM;
- goto free_alias;
+ return -ENOMEM;
}
node = of_create_node(i2c_node, eeprom_node_name);
if (!node) {
dev_err(priv->dev, "Failed to create node %s\n",
eeprom_node_name);
- ret = -ENOMEM;
- goto free_eeprom;
+ return -ENOMEM;
}
ret = of_property_write_string(node, "compatible", "atmel,24c256");
@@ -722,8 +720,6 @@ static int prt_imx6_rfid_fixup(struct prt_imx6_priv *priv,
return 0;
free_eeprom:
kfree(eeprom_node_name);
-free_alias:
- kfree(alias);
exit_error:
dev_err(priv->dev, "Failed to apply fixup: %pe\n", ERR_PTR(ret));
return ret;