Merge branch 'sh/driver-core'

[karo-tx-linux.git] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d10230adeb3650fe5ec38a51c2ef2434dff5da30..81865ee2eff39f5c1bcedd7952ccd1cbe9f48901 100644 (file)
--- 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",