]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
m68k: coldfire: return success for clk_enable(NULL)
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 29 Jul 2021 12:27:03 +0000 (15:27 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Sep 2021 08:00:51 +0000 (10:00 +0200)
[ Upstream commit f6a4f0b424df957d84fa7b9f2d02981234ff5828 ]

The clk_enable is supposed work when CONFIG_HAVE_CLK is false, but it
returns -EINVAL.  That means some drivers fail during probe.

[    1.680000] flexcan: probe of flexcan.0 failed with error -22

Fixes: c1fb1bf64bb6 ("m68k: let clk_enable() return immediately if clk is NULL")
Fixes: bea8bcb12da0 ("m68knommu: Add support for the Coldfire m5441x.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/m68k/coldfire/clk.c

index 076a9caa9557b1bbb54070071ab31892d6ff6f42..c895a189c5ae33e508acfd15234e7ee53f81d9c8 100644 (file)
@@ -92,7 +92,7 @@ int clk_enable(struct clk *clk)
        unsigned long flags;
 
        if (!clk)
-               return -EINVAL;
+               return 0;
 
        spin_lock_irqsave(&clk_lock, flags);
        if ((clk->enabled++ == 0) && clk->clk_ops)