Merge branch 'v3.18-next/armclkid' into v3.18-next/cpuclk

[mirror_ubuntu-zesty-kernel.git] / drivers / clk / zynq / pll.c

diff --git a/drivers/clk/zynq/pll.c b/drivers/clk/zynq/pll.c
index cec97596fe65988ff473e7f6d08302a7f68ba375..00d72fb5c0361e675c3930746588c19d860165da 100644 (file)
--- a/drivers/clk/zynq/pll.c
+++ b/drivers/clk/zynq/pll.c
@@ -211,10 +211,8 @@ struct clk *clk_register_zynq_pll(const char *name, const char *parent,
        };
 
        pll = kmalloc(sizeof(*pll), GFP_KERNEL);
-       if (!pll) {
-               pr_err("%s: Could not allocate Zynq PLL clk.\n", __func__);
+       if (!pll)
                return ERR_PTR(-ENOMEM);
-       }
 
        /* Populate the struct */
        pll->hw.init = &initd;