Merge tag 'tegra-for-5.5-memory-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / clocksource / timer-of.c

diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index 11ff701ff4bb99076a4e19b9faa10e1bd8229d7b..572da477c6d35c5edc64f16b5d8562cde5311d53 100644 (file)
--- a/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@ -57,8 +57,8 @@ static __init int timer_of_irq_init(struct device_node *np,
        if (of_irq->name) {
                of_irq->irq = ret = of_irq_get_byname(np, of_irq->name);
                if (ret < 0) {
-                       pr_err("Failed to get interrupt %s for %s\n",
-                              of_irq->name, np->full_name);
+                       pr_err("Failed to get interrupt %s for %pOF\n",
+                              of_irq->name, np);
                        return ret;
                }
        } else  {
@@ -192,7 +192,7 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to)
        }
 
        if (!to->clkevt.name)
-               to->clkevt.name = np->name;
+               to->clkevt.name = np->full_name;
 
        to->np = np;