Merge remote branch 'origin' into secretlab/next-spi

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/base/module.c b/drivers/base/module.c
index f32f2f9b7be5..db930d3ee312 100644
--- 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;
 }