From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 13 May 2010 09:02:28 +0000 (+0900)
Subject: Merge branch 'sh/driver-core'
X-Git-Tag: v2.6.35-rc1~504^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7;hp=209791b2cc3cdaf0f6ff49c25db975f8bbf573dd

Merge branch 'sh/driver-core'
---

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index d10230adeb36..81865ee2eff3 100644
--- 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",