Merge branch 'sh/driver-core'
authorPaul Mundt <lethal@linux-sh.org>
Thu, 13 May 2010 09:02:28 +0000 (18:02 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 13 May 2010 09:02:28 +0000 (18:02 +0900)
drivers/base/platform.c

index d10230a..81865ee 100644 (file)
@@ -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",