Merge branch 'sh/driver-core'

b9e3fc29 · Paul Mundt · 209791b2 · 06fe53be · b9e3fc29
Commit b9e3fc29 authored May 13, 2010 by Paul Mundt
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/base/platform.c drivers/base/platform.c +1 -1

No files found.
--- 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",