Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus

[~andy/linux] / drivers / base / module.c

diff --git a/drivers/base/module.c b/drivers/base/module.c
index f32f2f9b7be5fadb9a6f16300dc91cfcd7065ea3..db930d3ee31259f6a17b9dd33eb16caee4e12f5c 100644 (file)
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
@@ -15,12 +15,10 @@ static char *make_driver_name(struct device_driver *drv)
 {
        char *driver_name;
 
-       driver_name = kmalloc(strlen(drv->name) + strlen(drv->bus->name) + 2,
-                             GFP_KERNEL);
+       driver_name = kasprintf(GFP_KERNEL, "%s:%s", drv->bus->name, drv->name);
        if (!driver_name)
                return NULL;
 
-       sprintf(driver_name, "%s:%s", drv->bus->name, drv->name);
        return driver_name;
 }