3 files changed, 11 insertions, 3 deletions

diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt
index 8418d35484fc..eb1e28ad8822 100644
--- a/Documentation/sparc/sbus_drivers.txt
+++ b/Documentation/sparc/sbus_drivers.txt
@@ -67,10 +67,12 @@ probe in an SBUS driver under Linux:
         MODULE_DEVICE_TABLE(of, mydevice_match);
 
         static struct of_platform_driver mydevice_driver = {
-                .name           = "mydevice",
                 .match_table    = mydevice_match,
                 .probe          = mydevice_probe,
                 .remove         = __devexit_p(mydevice_remove),
+                .driver         = {
+                        .name           = "mydevice",
+                },
         };
 
         static int __init mydevice_init(void)
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);
 int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
 {
         /* initialize common driver fields */
-        drv->driver.name = drv->name;
+        if (!drv->driver.name)
+                drv->driver.name = drv->name;
+        if (!drv->driver.owner)
+                drv->driver.owner = drv->owner;
         drv->driver.bus = bus;
 
         /* 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);
 int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
 {
         /* initialize common driver fields */
-        drv->driver.name = drv->name;
+        if (!drv->driver.name)
+                drv->driver.name = drv->name;
+        if (!drv->driver.owner)
+                drv->driver.owner = drv->owner;
         drv->driver.bus = bus;
 
         /* register with core */