openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'sh/driver-core'

This commit is contained in:
Paul Mundt 2010-05-13 18:02:28 +09:00
parent 209791b2cc 06fe53beb6
commit b9e3fc29c0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/platform.c
View File

@ -1259,7 +1259,7 @@ static int __init early_platform_driver_probe_id(char *class_str,
* dev_name() and others to be used before the * dev_name() and others to be used before the
* rest of the driver core is initialized. * rest of the driver core is initialized.
*/ */
if (!match->dev.init_name) { if (!match->dev.init_name && slab_is_available()) {
if (match->id != -1) if (match->id != -1)
match->dev.init_name = match->dev.init_name =
kasprintf(GFP_KERNEL, "%s.%d", kasprintf(GFP_KERNEL, "%s.%d",