Around Fri 24 Jul 2015 13:49:48 +0300 or thereabout, Andy Shevchenko wrote: > Since NULL is used as valid clock object on optional clocks we have to handle > this case in avr32 implementation as well. > > Fixes: e1824dfe0d8e (net: macb: Adjust tx_clk when link speed changes) > Signed-off-by: Andy Shevchenko <[email protected]>
Acked-by: Hans-Christian Egtvedt <[email protected]> Although, IMO this should have been in the common part of the clk framework. I'll add it into my tree and ask Linus to pull it as a fix for current RC. > --- > arch/avr32/mach-at32ap/clock.c | 20 +++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c > index 23b1a97..52c179b 100644 > --- a/arch/avr32/mach-at32ap/clock.c > +++ b/arch/avr32/mach-at32ap/clock.c > @@ -80,6 +80,9 @@ int clk_enable(struct clk *clk) > { > unsigned long flags; > > + if (!clk) > + return 0; > + > spin_lock_irqsave(&clk_lock, flags); > __clk_enable(clk); > spin_unlock_irqrestore(&clk_lock, flags); > @@ -106,6 +109,9 @@ void clk_disable(struct clk *clk) > { > unsigned long flags; > > + if (IS_ERR_OR_NULL(clk)) > + return; > + > spin_lock_irqsave(&clk_lock, flags); > __clk_disable(clk); > spin_unlock_irqrestore(&clk_lock, flags); > @@ -117,6 +123,9 @@ unsigned long clk_get_rate(struct clk *clk) > unsigned long flags; > unsigned long rate; > > + if (!clk) > + return 0; > + > spin_lock_irqsave(&clk_lock, flags); > rate = clk->get_rate(clk); > spin_unlock_irqrestore(&clk_lock, flags); > @@ -129,6 +138,9 @@ long clk_round_rate(struct clk *clk, unsigned long rate) > { > unsigned long flags, actual_rate; > > + if (!clk) > + return 0; > + > if (!clk->set_rate) > return -ENOSYS; > > @@ -145,6 +157,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate) > unsigned long flags; > long ret; > > + if (!clk) > + return 0; > + > if (!clk->set_rate) > return -ENOSYS; > > @@ -161,6 +176,9 @@ int clk_set_parent(struct clk *clk, struct clk *parent) > unsigned long flags; > int ret; > > + if (!clk) > + return 0; > + > if (!clk->set_parent) > return -ENOSYS; > > @@ -174,7 +192,7 @@ EXPORT_SYMBOL(clk_set_parent); > > struct clk *clk_get_parent(struct clk *clk) > { > - return clk->parent; > + return !clk ? NULL : clk->parent; > } > EXPORT_SYMBOL(clk_get_parent); > -- mvh Hans-Christian Egtvedt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
