FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-13 04:41:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Paul Mundt 2010-03-29 16:00:06 +09:00
commit 620bb636df
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/base/platform.c
View File

@ -1245,19 +1245,20 @@ static int __init early_platform_driver_probe_id(char *class_str,
* rest of the driver core is initialized.
*/
if (!match->dev.init_name) {
char buf[32];
if (match->id != -1)
snprintf(buf, sizeof(buf), "%s.%d",
match->name, match->id);
match->dev.init_name =
kasprintf(GFP_KERNEL, "%s.%d",
match->name,
match->id);
else
snprintf(buf, sizeof(buf), "%s",
match->name);
match->dev.init_name =
kasprintf(GFP_KERNEL, "%s",
match->name);
match->dev.init_name = kstrdup(buf, GFP_KERNEL);
if (!match->dev.init_name)
return -ENOMEM;
}
if (epdrv->pdrv->probe(match))
pr_warning("%s: unable to probe %s early.\n",
class_str, match->name);