3.16.51-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Jonas Gorski <[email protected]> commit 94b282267c2f3af725b154c91275ed374c1f11de 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: facdf0ed4f59 ("m68knommu: introduce basic clk infrastructure") Cc: Greg Ungerer <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: [email protected] Cc: [email protected] Reported-by: Mathias Kresin <[email protected]> Signed-off-by: Jonas Gorski <[email protected]> Signed-off-by: Greg Ungerer <[email protected]> [bwh: Backported to 3.16: adjust filename] Signed-off-by: Ben Hutchings <[email protected]> --- arch/m68k/platform/coldfire/clk.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/m68k/platform/coldfire/clk.c +++ b/arch/m68k/platform/coldfire/clk.c @@ -117,6 +117,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);
