From: Robin van der Gracht <robin@protonic.nl> To: barebox@lists.infradead.org Cc: Oleksij Rempel <o.rempel@pengutronix.de>, Robin van der Gracht <robin@protonic.nl>, david@protonic.nl Subject: [PATCH 4/9] ARM: boards: protonic-imx6: Always free allocated alias string Date: Thu, 16 Jun 2022 15:11:09 +0200 [thread overview] Message-ID: <20220616131114.214628-5-robin@protonic.nl> (raw) In-Reply-To: <20220616131114.214628-1-robin@protonic.nl> 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> --- arch/arm/boards/protonic-imx6/board.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm/boards/protonic-imx6/board.c b/arch/arm/boards/protonic-imx6/board.c index 76c26fe296..7978553cb8 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; -- 2.34.1
next prev parent reply other threads:[~2022-06-16 13:12 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-16 13:11 [PATCH 0/9] ARM: boards: protonic-imx6: Updates Robin van der Gracht 2022-06-16 13:11 ` [PATCH 1/9] ARM: boards: protonic-imx6: prtvt7 hardkey inputs are active low Robin van der Gracht 2022-06-16 16:28 ` Oleksij Rempel 2022-06-16 16:38 ` Oleksij Rempel 2022-06-17 6:57 ` Sascha Hauer 2022-06-17 8:44 ` Marco Felsch 2022-06-20 7:51 ` Ahmad Fatoum 2022-06-20 8:16 ` Robin van der Gracht 2022-06-20 15:42 ` Robin van der Gracht 2022-06-20 6:48 ` Robin van der Gracht 2022-06-20 7:23 ` Oleksij Rempel 2022-06-16 13:11 ` [PATCH 2/9] ARM: boards: protonic-imx6: Update comment to match a recent code update Robin van der Gracht 2022-06-17 7:00 ` Sascha Hauer 2022-06-20 6:40 ` Robin van der Gracht 2022-06-16 13:11 ` [PATCH 3/9] ARM: boards: protonic-imx6: Free allocated autoboot_timeout string Robin van der Gracht 2022-06-16 13:11 ` Robin van der Gracht [this message] 2022-06-16 13:11 ` [PATCH 5/9] ARM: boards: protonic-imx6: Remove unsused argument from prt_imx6_usb_mount Robin van der Gracht 2022-06-16 13:11 ` [PATCH 6/9] ARM: boards: protonic-imx6: Register prt-usb boot entry Robin van der Gracht 2022-06-16 13:11 ` [PATCH 7/9] ARM: boards: protonic-imx6: Remove usb_delay from the priv struct Robin van der Gracht 2022-06-16 13:11 ` [PATCH 8/9] ARM: boards: protonic-imx6: Read serial and mac from fuses if available Robin van der Gracht 2022-06-16 13:11 ` [PATCH 9/9] ARM: boards: protonic-imx6: Register serial_number parameter with ocotp Robin van der Gracht 2022-06-17 7:10 ` (subset) [PATCH 0/9] ARM: boards: protonic-imx6: Updates Sascha Hauer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220616131114.214628-5-robin@protonic.nl \ --to=robin@protonic.nl \ --cc=barebox@lists.infradead.org \ --cc=david@protonic.nl \ --cc=o.rempel@pengutronix.de \ --subject='Re: [PATCH 4/9] ARM: boards: protonic-imx6: Always free allocated alias string' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox