diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 05:02:28 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 05:02:28 -0400 |
| commit | b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7 (patch) | |
| tree | 5b830e0f010ed84ecc84076e77d6730bc14abe10 /drivers/base | |
| parent | 209791b2cc3cdaf0f6ff49c25db975f8bbf573dd (diff) | |
| parent | 06fe53beb636294587d8e94ef83c06cef07c21fd (diff) | |
Merge branch 'sh/driver-core'
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, | |||
| 1259 | * dev_name() and others to be used before the | 1259 | * dev_name() and others to be used before the |
| 1260 | * rest of the driver core is initialized. | 1260 | * rest of the driver core is initialized. |
| 1261 | */ | 1261 | */ |
| 1262 | if (!match->dev.init_name) { | 1262 | if (!match->dev.init_name && slab_is_available()) { |
| 1263 | if (match->id != -1) | 1263 | if (match->id != -1) |
| 1264 | match->dev.init_name = | 1264 | match->dev.init_name = |
| 1265 | kasprintf(GFP_KERNEL, "%s.%d", | 1265 | kasprintf(GFP_KERNEL, "%s.%d", |