smc91x: avoid self-comparison warning

[firefly-linux-kernel-4.4.55.git] / drivers / base / module.c

diff --git a/drivers/base/module.c b/drivers/base/module.c
index f32f2f9b7be5fadb9a6f16300dc91cfcd7065ea3..2a215780eda25c7c33ac44c136c4fadd36238ab8 100644 (file)
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
@@ -15,21 +15,21 @@ 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;
 }
 
 static void module_create_drivers_dir(struct module_kobject *mk)
 {
-       if (!mk || mk->drivers_dir)
-               return;
+       static DEFINE_MUTEX(drivers_dir_mutex);
 
-       mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+       mutex_lock(&drivers_dir_mutex);
+       if (mk && !mk->drivers_dir)
+               mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
+       mutex_unlock(&drivers_dir_mutex);
 }
 
 void module_add_driver(struct module *mod, struct device_driver *drv)