3.16.51-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Jonas Gorski <[email protected]> commit 585e0e9d02a690c29932b2fc0789835c7b91d448 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: 780019ddf02f ("MIPS: AR7: Implement clock API") Signed-off-by: Jonas Gorski <[email protected]> Reported-by: Mathias Kresin <[email protected]> Cc: Paul Gortmaker <[email protected]> Cc: James Hogan <[email protected]> Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/16775/ Signed-off-by: Ralf Baechle <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- arch/mips/ar7/clock.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/mips/ar7/clock.c +++ b/arch/mips/ar7/clock.c @@ -430,6 +430,9 @@ EXPORT_SYMBOL(clk_disable); unsigned long clk_get_rate(struct clk *clk) { + if (!clk) + return 0; + return clk->rate; } EXPORT_SYMBOL(clk_get_rate);
