Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753487AbcDSMPd (ORCPT ); Tue, 19 Apr 2016 08:15:33 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:29985 "EHLO smtp2-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752304AbcDSMPc (ORCPT ); Tue, 19 Apr 2016 08:15:32 -0400 To: Daniel Lezcano , Thomas Gleixner Cc: Sebastian Frias , Mans Rullgard , LKML From: Mason Subject: [PATCH] clocksource/drivers/tango-xtal: Fix incorrect test Message-ID: <57162153.4070707@free.fr> Date: Tue, 19 Apr 2016 14:15:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0 SeaMonkey/2.39 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1259 Lines: 37 From: Marc Gonzalez Commit 0881841f7e78 changed "if (ret != 0)" to "if (!ret)" Fixes: 0881841f7e78 ("Replace code by clocksource_mmio_init") Signed-off-by: Marc Gonzalez --- drivers/clocksource/tango_xtal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/tango_xtal.c b/drivers/clocksource/tango_xtal.c index 2bcecafdeaea..0464c52e61f1 100644 --- a/drivers/clocksource/tango_xtal.c +++ b/drivers/clocksource/tango_xtal.c @@ -22,7 +22,7 @@ static u64 notrace read_sched_clock(void) static void __init tango_clocksource_init(struct device_node *np) { struct clk *clk; - int xtal_freq, ret; + int xtal_freq, err; xtal_in_cnt = of_iomap(np, 0); if (xtal_in_cnt == NULL) { @@ -40,9 +40,9 @@ static void __init tango_clocksource_init(struct device_node *np) delay_timer.freq = xtal_freq; delay_timer.read_current_timer = read_xtal_counter; - ret = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350, + err = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350, 32, clocksource_mmio_readl_up); - if (!ret) { + if (err) { pr_err("%s: registration failed\n", np->full_name); return; } -- 2.8.1