Merge branch 'x86/mpx' into x86/asm, to pick up dependent commits

[sfrench/cifs-2.6.git] / drivers / clk / clk-stm32f4.c

diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c
index 68e2a4e499f1d31ec490b29cb08eb16dcbf6d418..96c6b6bc8f0e475f9d03de0ffa5210a2f06acae2 100644 (file)
--- a/drivers/clk/clk-stm32f4.c
+++ b/drivers/clk/clk-stm32f4.c
@@ -1541,8 +1541,8 @@ static void __init stm32f4_rcc_init(struct device_node *np)
                    base + gd->offset, gd->bit_idx, 0, &stm32f4_clk_lock);
 
                if (IS_ERR(clks[idx])) {
-                       pr_err("%s: Unable to register leaf clock %s\n",
-                              np->full_name, gd->name);
+                       pr_err("%pOF: Unable to register leaf clock %s\n",
+                              np, gd->name);
                        goto fail;
                }
        }