From: Simon Glass <sjg@chromium.org>
Date: Sun, 1 May 2016 19:52:24 +0000 (-0600)
Subject: dm: blk: Free the block device name when unbound
X-Git-Tag: v2016.07-rc1~203^2~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d0773524e18d2439390c88611b49f23ca46a82be;p=oweals%2Fu-boot.git

dm: blk: Free the block device name when unbound

Mark the device name as allocated so that it will be freed correctly when the
device is unbound.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index f67f9b9d55..a37239ee50 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -468,14 +468,22 @@ int blk_create_devicef(struct udevice *parent, const char *drv_name,
 		       lbaint_t size, struct udevice **devp)
 {
 	char dev_name[30], *str;
+	int ret;
 
 	snprintf(dev_name, sizeof(dev_name), "%s.%s", parent->name, name);
 	str = strdup(dev_name);
 	if (!str)
 		return -ENOMEM;
 
-	return blk_create_device(parent, drv_name, str, if_type, devnum,
-				 blksz, size, devp);
+	ret = blk_create_device(parent, drv_name, str, if_type, devnum,
+				blksz, size, devp);
+	if (ret) {
+		free(str);
+		return ret;
+	}
+	device_set_name_alloced(*devp);
+
+	return ret;
 }
 
 int blk_unbind_all(int if_type)