Commit a422ce5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu update from Greg Ungerer:
 "Only a single change. NULL parameter check in the local ColdFire
  clocking code"

* tag 'm68knommu-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: let clk_enable() return immediately if clk is NULL
parents 8b1e2c50 c1fb1bf6

arch/m68k/coldfire/clk.c

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ EXPORT_SYMBOL(clk_get); 
int clk_enable(struct clk *clk)

{

	unsigned long flags;



	if (!clk)

		return -EINVAL;



	spin_lock_irqsave(&clk_lock, flags);

	if ((clk->enabled++ == 0) && clk->clk_ops)

		clk->clk_ops->enable(clk);