diff options
| author | Mathias Kresin <dev@kresin.me> | 2017-07-28 20:09:53 +0200 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-07-29 09:24:55 +0200 |
| commit | 5e87b01275e20226a08538d447ca7714e824cc2c (patch) | |
| tree | 35f60087dc9fc7d4f05ee08849a0ddbd64076e9c /target/linux/brcm63xx/patches-4.4/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch | |
| parent | 2247af82df2174829eb5a37076ead0520d3ab580 (diff) | |
| download | upstream-5e87b01275e20226a08538d447ca7714e824cc2c.tar.gz upstream-5e87b01275e20226a08538d447ca7714e824cc2c.tar.bz2 upstream-5e87b01275e20226a08538d447ca7714e824cc2c.zip | |
brcm63xx: add NULL clock fix send upstream
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: FS#735
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.4/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch b/target/linux/brcm63xx/patches-4.4/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch new file mode 100644 index 0000000000..75a3a23a9f --- /dev/null +++ b/target/linux/brcm63xx/patches-4.4/111-MIPS-BCM63XX-allow-NULL-clock-for-clk_get_rate.patch @@ -0,0 +1,48 @@ +From patchwork Tue Jul 18 10:17:27 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [6/9] MIPS: BCM63XX: allow NULL clock for clk_get_rate +X-Patchwork-Submitter: Jonas Gorski <jonas.gorski@gmail.com> +X-Patchwork-Id: 16776 +Message-Id: <20170718101730.2541-7-jonas.gorski@gmail.com> +To: unlisted-recipients:; (no To-header on input) +Cc: Ralf Baechle <ralf@linux-mips.org>, + Florian Fainelli <f.fainelli@gmail.com>, + bcm-kernel-feedback-list@broadcom.com, + James Hogan <james.hogan@imgtec.com>, + linux-mips@linux-mips.org, linux-kernel@vger.kernel.org +Date: Tue, 18 Jul 2017 12:17:27 +0200 +From: Jonas Gorski <jonas.gorski@gmail.com> +List-Id: linux-mips <linux-mips.eddie.linux-mips.org> + +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: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.") +Cc: Ralf Baechle <ralf@linux-mips.org> +Cc: Florian Fainelli <f.fainelli@gmail.com> +Cc: bcm-kernel-feedback-list@broadcom.com +Cc: James Hogan <james.hogan@imgtec.com> +Cc: linux-mips@linux-mips.org +Cc: linux-kernel@vger.kernel.org +Reported-by: Mathias Kresin <dev@kresin.me> +Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> +Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> +--- + arch/mips/bcm63xx/clk.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/arch/mips/bcm63xx/clk.c ++++ b/arch/mips/bcm63xx/clk.c +@@ -345,6 +345,9 @@ EXPORT_SYMBOL(clk_disable); + + unsigned long clk_get_rate(struct clk *clk) + { ++ if (!clk) ++ return 0; ++ + return clk->rate; + } + |