---

yaml --- r: 196039 b: refs/heads/master c: 1653268 h: refs/heads/master i: 196037: a397aa8 196035: 5d5c34c 196031: 00463a6 v: v3
git-mirror · May 21, 2010 · 68d5159 · 68d5159
1 parent b4c7e70
commit 68d5159
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffa156590f98b750161757a16c37ac8e152a7859
+refs/heads/master: 1653268b1b538981df9bb85d637456530938be6c
diff --git a/trunk/drivers/base/module.c b/trunk/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;
 }