From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0F59C3276C for ; Thu, 2 Jan 2020 22:45:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 698E720848 for ; Thu, 2 Jan 2020 22:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578005147; bh=kWYJw8yz98cDlxYMDB+WRSgLhd+BiUXxFTIFTO0ALxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z3Ej52pAp8WT+jPO0/wuiUpZ82XFTKLdGFE0aj0kpgAQCKYx4pqflILi5u7rxklSY qENtf3qr32rSt8gQtbIM/yo7viZpJd74kYB60rp94tP0Q3w2FCUC2gYY/ypZlq04rq k1T7hyw/8tc7++H/c9Hr0le37gAShfX4hCV64AJY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730559AbgABWpq (ORCPT ); Thu, 2 Jan 2020 17:45:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:37150 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730312AbgABWbm (ORCPT ); Thu, 2 Jan 2020 17:31:42 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2BF5521D7D; Thu, 2 Jan 2020 22:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004301; bh=kWYJw8yz98cDlxYMDB+WRSgLhd+BiUXxFTIFTO0ALxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LKhdi/rZuLUIrlhzWg8eYyCuBtml9o8yyb/IMyY+IuOdyV6x35N1qKf+CL5LvdDl7 ijRgX0wPnK0spEmbCTP9XR851kQKxtEHWqh3evLWXw8If0dwWpJ87Pg//C/GCU3WvD sTRfkQTuGKqDBFAgQXlrruKcJdOfHuImdJyRxT8g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , Daniel Lezcano , Sasha Levin Subject: [PATCH 4.9 121/171] clocksource/drivers/asm9260: Add a check for of_clk_get Date: Thu, 2 Jan 2020 23:07:32 +0100 Message-Id: <20200102220603.868172548@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.960200039@linuxfoundation.org> References: <20200102220546.960200039@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chuhong Yuan [ Upstream commit 6e001f6a4cc73cd06fc7b8c633bc4906c33dd8ad ] asm9260_timer_init misses a check for of_clk_get. Add a check for it and print errors like other clocksource drivers. Signed-off-by: Chuhong Yuan Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20191016124330.22211-1-hslester96@gmail.com Signed-off-by: Sasha Levin --- drivers/clocksource/asm9260_timer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c index 1ba871b7fe11..e5717807c00a 100644 --- a/drivers/clocksource/asm9260_timer.c +++ b/drivers/clocksource/asm9260_timer.c @@ -198,6 +198,10 @@ static int __init asm9260_timer_init(struct device_node *np) } clk = of_clk_get(np, 0); + if (IS_ERR(clk)) { + pr_err("Failed to get clk!\n"); + return PTR_ERR(clk); + } ret = clk_prepare_enable(clk); if (ret) { -- 2.20.1