diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-10 21:07:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-10 21:07:39 -0700 |
| commit | 64414e5f9896805c2e80583345e9b1745be73aa9 (patch) | |
| tree | ee11362c144c7028f1271cf6be8bdf1065f1781e /arch/m68k/coldfire/clk.c | |
| parent | e90937e756938f03d37d4cae7c82316a3a425944 (diff) | |
| parent | 8a1943492bd629b7eae64535a96fcb959a01bbd0 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"Only two changes. One removes unused code, the other makes local clock
code arguments consistent with generic clock code"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: remove dead code
m68k: allow NULL clock for clk_get_rate
Diffstat (limited to 'arch/m68k/coldfire/clk.c')
| -rw-r--r-- | arch/m68k/coldfire/clk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/coldfire/clk.c b/arch/m68k/coldfire/clk.c index 1e3c7e9193d1..856069a3196d 100644 --- a/arch/m68k/coldfire/clk.c +++ b/arch/m68k/coldfire/clk.c @@ -121,6 +121,9 @@ EXPORT_SYMBOL(clk_put); unsigned long clk_get_rate(struct clk *clk) { + if (!clk) + return 0; + return clk->rate; } EXPORT_SYMBOL(clk_get_rate); |