3.16.51-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Jonas Gorski <[email protected]> commit a18097b7676bf5fb2677bf5e6cc24e721d7c2596 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: 3f0a06b0368d ("MIPS: ralink: adds clkdev code") Reported-by: Mathias Kresin <[email protected]> Signed-off-by: Jonas Gorski <[email protected]> Cc: John Crispin <[email protected]> Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/16778/ Signed-off-by: Ralf Baechle <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- arch/mips/ralink/clk.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/mips/ralink/clk.c +++ b/arch/mips/ralink/clk.c @@ -52,6 +52,9 @@ EXPORT_SYMBOL_GPL(clk_disable); unsigned long clk_get_rate(struct clk *clk) { + if (!clk) + return 0; + return clk->rate; } EXPORT_SYMBOL_GPL(clk_get_rate);
