From 68d5159be5665803f1e36c46769452d39c67e3df Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 10 Mar 2010 22:18:13 +0100 Subject: [PATCH] --- yaml --- r: 196039 b: refs/heads/master c: 1653268b1b538981df9bb85d637456530938be6c h: refs/heads/master i: 196037: a397aa8cae45de6d9a4106e2cadde252dfaa635a 196035: 5d5c34c36f76aae86738292449d3d8b70e580707 196031: 00463a6e48275c3d69e4b8168f70ccee5be342f5 v: v3 --- [refs] | 2 +- trunk/drivers/base/module.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8498705942aa..335cdc442c2a 100644 --- 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 index f32f2f9b7be5..db930d3ee312 100644 --- 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; }