Browse Source

Merge branch 'sh/driver-core'

Paul Mundt 15 years ago
parent
commit
b9e3fc29c0
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/base/platform.c

+ 1 - 1
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",