diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 11:02:28 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 11:02:28 +0200 |
| commit | b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7 (patch) | |
| tree | 5b830e0f010ed84ecc84076e77d6730bc14abe10 /drivers/base/platform.c | |
| parent | Merge branch 'sh/highmem' (diff) | |
| parent | driver core: Early dev_name() depends on slab_is_available(). (diff) | |
| download | linux-b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7.tar.xz linux-b9e3fc29c08a6dcbe19606cfba19c1fcc0551ed7.zip | |
Merge branch 'sh/driver-core'
Diffstat (limited to 'drivers/base/platform.c')
| -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, * 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", |