diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-03-29 09:00:06 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-29 09:00:06 +0200 |
| commit | 620bb636dfb36574b57a89a4c3029237d69bee04 (patch) | |
| tree | 1dc01d851dd87b2a15edba0a7b89a27ef46f05d3 | |
| parent | serial: sh-sci: clkdev updates for MSTP gating. (diff) | |
| parent | driver core: Convert to kasprintf() for early dev_name(). (diff) | |
| download | linux-620bb636dfb36574b57a89a4c3029237d69bee04.tar.xz linux-620bb636dfb36574b57a89a4c3029237d69bee04.zip | |
Merge branch 'sh/driver-core' into sh/clkfwk
| -rw-r--r-- | drivers/base/platform.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index d2d4926c5c4c..f2377f3d95e5 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -1245,19 +1245,20 @@ static int __init early_platform_driver_probe_id(char *class_str, * rest of the driver core is initialized. */ if (!match->dev.init_name) { - char buf[32]; - if (match->id != -1) - snprintf(buf, sizeof(buf), "%s.%d", - match->name, match->id); + match->dev.init_name = + kasprintf(GFP_KERNEL, "%s.%d", + match->name, + match->id); else - snprintf(buf, sizeof(buf), "%s", - match->name); + match->dev.init_name = + kasprintf(GFP_KERNEL, "%s", + match->name); - match->dev.init_name = kstrdup(buf, GFP_KERNEL); if (!match->dev.init_name) return -ENOMEM; } + if (epdrv->pdrv->probe(match)) pr_warning("%s: unable to probe %s early.\n", class_str, match->name); |