Message ID | 20170718101730.2541-2-jonas.gorski@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 18/07/17 12:17, Jonas Gorski wrote: > 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: 1d81eedb8f6c ("[ARM] 3634/1: ep93xx: initial implementation of the clk_* API") > Cc: Hartley Sweeten <hsweeten@visionengravers.com> > Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Reported-by: Mathias Kresin <dev@kresin.me> > Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> > --- > arch/arm/mach-ep93xx/clock.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c > index 39ef3b613912..f0768befafe8 100644 > --- a/arch/arm/mach-ep93xx/clock.c > +++ b/arch/arm/mach-ep93xx/clock.c > @@ -316,6 +316,9 @@ static unsigned long get_uart_rate(struct clk *clk) > > unsigned long clk_get_rate(struct clk *clk) > { > + if (!clk) > + return 0; > + > if (clk->get_rate) > return clk->get_rate(clk);
diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 39ef3b613912..f0768befafe8 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c @@ -316,6 +316,9 @@ static unsigned long get_uart_rate(struct clk *clk) unsigned long clk_get_rate(struct clk *clk) { + if (!clk) + return 0; + if (clk->get_rate) return clk->get_rate(clk);
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: 1d81eedb8f6c ("[ARM] 3634/1: ep93xx: initial implementation of the clk_* API") Cc: Hartley Sweeten <hsweeten@visionengravers.com> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com> Cc: Russell King <linux@armlinux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reported-by: Mathias Kresin <dev@kresin.me> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- arch/arm/mach-ep93xx/clock.c | 3 +++ 1 file changed, 3 insertions(+)