dm: blk: Free the block device name when unbound
authorSimon Glass <sjg@chromium.org>
Sun, 1 May 2016 19:52:24 +0000 (13:52 -0600)
committerSimon Glass <sjg@chromium.org>
Tue, 17 May 2016 15:54:43 +0000 (09:54 -0600)
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>
drivers/block/blk-uclass.c

index f67f9b9..a37239e 100644 (file)
@@ -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)