Merge tag 'v3.5-rc6' into irqdomain/next

[deliverable/linux.git] / drivers / of / base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index eada3f4ef80100de1e0c3f8f2a236acff6e662a2..c499cc817c172da4f8c52e9cbae683c8b8cdfbdd 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1195,7 +1195,7 @@ static void of_alias_add(struct alias_prop *ap, struct device_node *np,
        ap->stem[stem_len] = 0;
        list_add_tail(&ap->link, &aliases_lookup);
        pr_debug("adding DT alias:%s: stem=%s id=%i node=%s\n",
-                ap->alias, ap->stem, ap->id, np ? np->full_name : NULL);
+                ap->alias, ap->stem, ap->id, of_node_full_name(np));
 }
 
 /**