mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-22 23:04:43 +00:00
Merge branches 'sh/intc-extension', 'sh/dmaengine', 'sh/serial-dma' and 'sh/clkfwk'
Conflicts: arch/sh/kernel/cpu/clock.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
commit
720fcb36ac
52 changed files with 863 additions and 697 deletions
|
@ -1254,6 +1254,26 @@ static int __init early_platform_driver_probe_id(char *class_str,
|
|||
}
|
||||
|
||||
if (match) {
|
||||
/*
|
||||
* Set up a sensible init_name to enable
|
||||
* dev_name() and others to be used before the
|
||||
* rest of the driver core is initialized.
|
||||
*/
|
||||
if (!match->dev.init_name) {
|
||||
if (match->id != -1)
|
||||
match->dev.init_name =
|
||||
kasprintf(GFP_KERNEL, "%s.%d",
|
||||
match->name,
|
||||
match->id);
|
||||
else
|
||||
match->dev.init_name =
|
||||
kasprintf(GFP_KERNEL, "%s",
|
||||
match->name);
|
||||
|
||||
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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue