Merge tag 'tag-chrome-platform-for-v4.20' of git://git.kernel.org/pub/scm/linux/kerne...

[linux.git] / drivers / macintosh / macio_asic.c

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 07074820a16746ec74351ea2273cfecee27e6353..17d3bc917562ed5024b60e9f1d95ca1137162791 100644 (file)
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -360,9 +360,10 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
                                               struct macio_dev *in_bay,
                                               struct resource *parent_res)
 {
+       char name[MAX_NODE_NAME_SIZE + 1];
        struct macio_dev *dev;
        const u32 *reg;
-       
+
        if (np == NULL)
                return NULL;
 
@@ -402,6 +403,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 #endif
 
        /* MacIO itself has a different reg, we use it's PCI base */
+       snprintf(name, sizeof(name), "%pOFn", np);
        if (np == chip->of_node) {
                dev_set_name(&dev->ofdev.dev, "%1d.%08x:%.*s",
                             chip->lbus.index,
@@ -410,12 +412,12 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 #else
                        0, /* NuBus may want to do something better here */
 #endif
-                       MAX_NODE_NAME_SIZE, np->name);
+                       MAX_NODE_NAME_SIZE, name);
        } else {
                reg = of_get_property(np, "reg", NULL);
                dev_set_name(&dev->ofdev.dev, "%1d.%08x:%.*s",
                             chip->lbus.index,
-                            reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);
+                            reg ? *reg : 0, MAX_NODE_NAME_SIZE, name);
        }
 
        /* Setup interrupts & resources */