Skip to content

Commit a422ce5

Browse files
committed
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
2 parents 8b1e2c5 + c1fb1bf commit a422ce5

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

arch/m68k/coldfire/clk.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ EXPORT_SYMBOL(clk_get);
9090
int clk_enable(struct clk *clk)
9191
{
9292
unsigned long flags;
93+
94+
if (!clk)
95+
return -EINVAL;
96+
9397
spin_lock_irqsave(&clk_lock, flags);
9498
if ((clk->enabled++ == 0) && clk->clk_ops)
9599
clk->clk_ops->enable(clk);

0 commit comments

Comments
 (0)