Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[sfrench/cifs-2.6.git] / drivers / clocksource / bcm2835_timer.c

diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c
index 82828d3a4739aa601a0690a6ac6963a7336805e3..39e489a96ad74f0f8e341aa2b3f9c8e6acfc4bfe 100644 (file)
--- a/drivers/clocksource/bcm2835_timer.c
+++ b/drivers/clocksource/bcm2835_timer.c
@@ -114,7 +114,6 @@ static int __init bcm2835_timer_init(struct device_node *node)
 
        timer = kzalloc(sizeof(*timer), GFP_KERNEL);
        if (!timer) {
-               pr_err("Can't allocate timer struct\n");
                ret = -ENOMEM;
                goto err_iounmap;
        }