Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751870AbdGRKTT (ORCPT ); Tue, 18 Jul 2017 06:19:19 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:34518 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751494AbdGRKRr (ORCPT ); Tue, 18 Jul 2017 06:17:47 -0400 From: Jonas Gorski Cc: Ralf Baechle , Paul Gortmaker , James Hogan , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/9] MIPS: AR7: allow NULL clock for clk_get_rate Date: Tue, 18 Jul 2017 12:17:26 +0200 Message-Id: <20170718101730.2541-6-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: 943 Lines: 32 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: 780019ddf02f ("MIPS: AR7: Implement clock API") Cc: Ralf Baechle Cc: Paul Gortmaker Cc: James Hogan Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Reported-by: Mathias Kresin Signed-off-by: Jonas Gorski --- arch/mips/ar7/clock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c index dda422a0f36c..0137656107a9 100644 --- a/arch/mips/ar7/clock.c +++ b/arch/mips/ar7/clock.c @@ -430,6 +430,9 @@ EXPORT_SYMBOL(clk_disable); unsigned long clk_get_rate(struct clk *clk) { + if (!clk) + return 0; + return clk->rate; } EXPORT_SYMBOL(clk_get_rate); -- 2.11.0