diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/of_device.c | 5 | ||||
| -rw-r--r-- | arch/sparc64/kernel/of_device.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index 36383f73d685..fb2caef79cec 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
| @@ -588,7 +588,10 @@ __setup("of_debug=", of_debug); | |||
| 588 | int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) | 588 | int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) |
| 589 | { | 589 | { |
| 590 | /* initialize common driver fields */ | 590 | /* initialize common driver fields */ |
| 591 | drv->driver.name = drv->name; | 591 | if (!drv->driver.name) |
| 592 | drv->driver.name = drv->name; | ||
| 593 | if (!drv->driver.owner) | ||
| 594 | drv->driver.owner = drv->owner; | ||
| 592 | drv->driver.bus = bus; | 595 | drv->driver.bus = bus; |
| 593 | 596 | ||
| 594 | /* register with core */ | 597 | /* register with core */ |
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index 4cc77485f536..42d779866fba 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/kernel/of_device.c | |||
| @@ -872,7 +872,10 @@ __setup("of_debug=", of_debug); | |||
| 872 | int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) | 872 | int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus) |
| 873 | { | 873 | { |
| 874 | /* initialize common driver fields */ | 874 | /* initialize common driver fields */ |
| 875 | drv->driver.name = drv->name; | 875 | if (!drv->driver.name) |
| 876 | drv->driver.name = drv->name; | ||
| 877 | if (!drv->driver.owner) | ||
| 878 | drv->driver.owner = drv->owner; | ||
| 876 | drv->driver.bus = bus; | 879 | drv->driver.bus = bus; |
| 877 | 880 | ||
| 878 | /* register with core */ | 881 | /* register with core */ |