summaryrefslogtreecommitdiffstats
path: root/drivers/hsi/hsi_core.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-04-09 14:08:17 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-22 10:57:31 +0200
commitd58efadffd38a6a691abb7208332c76a3f5a1826 (patch)
tree15f8dbe4ce03340692b63ceb58b8dd4bcb36c360 /drivers/hsi/hsi_core.c
parentba411a860971bbd7ea05ff741d75de115e7674ba (diff)
downloadlinux-stable-d58efadffd38a6a691abb7208332c76a3f5a1826.tar.gz
linux-stable-d58efadffd38a6a691abb7208332c76a3f5a1826.tar.bz2
linux-stable-d58efadffd38a6a691abb7208332c76a3f5a1826.zip
HSI: core: fix resource leaks in hsi_add_client_from_dt()
[ Upstream commit 5c08b0f75575648032f309a6f58294453423ed93 ] If some of the allocations fail between the dev_set_name() and the device_register() then the name will not be freed. Fix this by moving dev_set_name() directly in front of the call to device_register(). Fixes: a2aa24734d9d ("HSI: Add common DT binding for HSI client devices") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/hsi/hsi_core.c')
-rw-r--r--drivers/hsi/hsi_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c
index 9065efd21851..71895da63810 100644
--- a/drivers/hsi/hsi_core.c
+++ b/drivers/hsi/hsi_core.c
@@ -223,8 +223,6 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
if (err)
goto err;
- dev_set_name(&cl->device, "%s", name);
-
err = hsi_of_property_parse_mode(client, "hsi-mode", &mode);
if (err) {
err = hsi_of_property_parse_mode(client, "hsi-rx-mode",
@@ -306,6 +304,7 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
cl->device.release = hsi_client_release;
cl->device.of_node = client;
+ dev_set_name(&cl->device, "%s", name);
if (device_register(&cl->device) < 0) {
pr_err("hsi: failed to register client: %s\n", name);
put_device(&cl->device);