Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751567AbdGRKTm (ORCPT ); Tue, 18 Jul 2017 06:19:42 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:32931 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751336AbdGRKRn (ORCPT ); Tue, 18 Jul 2017 06:17:43 -0400 From: Jonas Gorski Cc: Eric Miao , Haojian Zhuang , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/9] ARM: mmp: allow NULL clock for clk_get_rate Date: Tue, 18 Jul 2017 12:17:23 +0200 Message-Id: <20170718101730.2541-3-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170718101730.2541-1-jonas.gorski@gmail.com> References: <20170718101730.2541-1-jonas.gorski@gmail.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1071 Lines: 33 Make the behaviour of clk_get_rate consistent with common clk's clk_get_rate by accepting NULL clocks as parameter. Some device drivers rely on this, and will cause an OOPS otherwise. Fixes: 49cbe78637eb ("[ARM] pxa: add base support for Marvell's PXA168 processor line") Cc: Eric Miao Cc: Haojian Zhuang Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reported-by: Mathias Kresin Signed-off-by: Jonas Gorski --- arch/arm/mach-mmp/clock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mmp/clock.c b/arch/arm/mach-mmp/clock.c index 28fe64c6e2f5..bdfb113431ec 100644 --- a/arch/arm/mach-mmp/clock.c +++ b/arch/arm/mach-mmp/clock.c @@ -83,7 +83,9 @@ unsigned long clk_get_rate(struct clk *clk) { unsigned long rate; - if (clk->ops->getrate) + if (!clk) + rate = 0; + else if (clk->ops->getrate) rate = clk->ops->getrate(clk); else rate = clk->rate; -- 2.11.0