summaryrefslogtreecommitdiffstats
path: root/drivers/base/platform.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-13 18:02:28 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-05-13 18:02:28 +0900
commitb9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7 (patch)
tree5b830e0f010ed84ecc84076e77d6730bc14abe10 /drivers/base/platform.c
parent209791b2cc3cdaf0f6ff49c25db975f8bbf573dd (diff)
parent06fe53beb636294587d8e94ef83c06cef07c21fd (diff)
downloadlinux-b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7.tar.bz2
Merge branch 'sh/driver-core'
Diffstat (limited to 'drivers/base/platform.c')
-rw-r--r--drivers/base/platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d10230adeb36..81865ee2eff3 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1259,7 +1259,7 @@ static int __init early_platform_driver_probe_id(char *class_str,
* dev_name() and others to be used before the
* rest of the driver core is initialized.
*/
- if (!match->dev.init_name) {
+ if (!match->dev.init_name && slab_is_available()) {
if (match->id != -1)
match->dev.init_name =
kasprintf(GFP_KERNEL, "%s.%d",