From: Jonas Gorski <jonas.gorski@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Eric Miao <eric.y.miao@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Russell King <linux@armlinux.org.uk>,
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 [thread overview]
Message-ID: <20170718101730.2541-3-jonas.gorski@gmail.com> (raw)
In-Reply-To: <20170718101730.2541-1-jonas.gorski@gmail.com>
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 <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Reported-by: Mathias Kresin <dev@kresin.me>
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---
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
next prev parent reply other threads:[~2017-07-18 10:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-18 10:17 [PATCH 0/9] make clk_get_rate implementations behavior more consistent Jonas Gorski
2017-07-18 10:17 ` [PATCH 1/9] ARM: ep93xx: allow NULL clock for clk_get_rate Jonas Gorski
2017-07-19 5:04 ` Alexander Sverdlin
2017-07-18 10:17 ` Jonas Gorski [this message]
2017-07-18 10:17 ` [PATCH 3/9] blackfin: bf609: " Jonas Gorski
2017-07-18 18:54 ` Masahiro Yamada
2017-07-18 10:17 ` [PATCH 4/9] m68k: " Jonas Gorski
2017-07-18 12:03 ` Greg Ungerer
2017-07-19 9:06 ` Jonas Gorski
2017-07-19 12:21 ` Greg Ungerer
2017-07-18 10:17 ` [PATCH 5/9] MIPS: AR7: " Jonas Gorski
2017-07-18 10:17 ` [PATCH 6/9] MIPS: BCM63XX: " Jonas Gorski
2017-07-18 19:55 ` Florian Fainelli
2017-07-18 10:17 ` [PATCH 7/9] MIPS: Loongson 2F: " Jonas Gorski
2017-07-18 10:17 ` [PATCH 8/9] MIPS: ralink: " Jonas Gorski
2017-07-18 10:17 ` [PATCH 9/9] unicore32: " Jonas Gorski
2017-07-18 12:01 ` [PATCH 0/9] make clk_get_rate implementations behavior more consistent Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170718101730.2541-3-jonas.gorski@gmail.com \
--to=jonas.gorski@gmail.com \
--cc=eric.y.miao@gmail.com \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®