Merge branch 'sh/driver-core'

mariux64 · May 13, 2010 · b9e3fc2 · b9e3fc2
2 parents 209791b + 06fe53b
commit b9e3fc2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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",