Merge tag 'mips_fixes_4.20_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux.git] / drivers / of / device.c

diff --git a/drivers/of/device.c b/drivers/of/device.c
index c7fa5a9697c91ef55c3bd9b7adff0ec779686f54..0f27fad9fe940de645f61f868d0578795e073abc 100644 (file)
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -207,7 +207,8 @@ static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len
                return -ENODEV;
 
        /* Name & Type */
-       csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name,
+       /* %p eats all alphanum characters, so %c must be used here */
+       csize = snprintf(str, len, "of:N%pOFn%c%s", dev->of_node, 'T',
                         dev->of_node->type);
        tsize = csize;
        len -= csize;
@@ -286,7 +287,7 @@ void of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
        if ((!dev) || (!dev->of_node))
                return;
 
-       add_uevent_var(env, "OF_NAME=%s", dev->of_node->name);
+       add_uevent_var(env, "OF_NAME=%pOFn", dev->of_node);
        add_uevent_var(env, "OF_FULLNAME=%pOF", dev->of_node);
        if (dev->of_node->type && strcmp("<NULL>", dev->of_node->type) != 0)
                add_uevent_var(env, "OF_TYPE=%s", dev->of_node->type);