summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-03-01 20:44:22 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-03-01 20:44:22 +0300
commit1d2aea1bcf68992c90218f47405bee29efd722cd (patch)
treeb4497ef833a7da3c85b3e4445426409959e724cd /drivers
parenta8356cdb5bd5abc74f814d76bd37900997fad35d (diff)
parentff30bd6a6618e979b16977617371c0f28a95036e (diff)
downloadlinux-1d2aea1bcf68992c90218f47405bee29efd722cd.tar.xz
Merge tag 'sh-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh updates from John Paul Adrian Glaubitz: - regression fix in connection with the rtl8169 driver on SuperH boards that was introduced when the driver was switched to use devm_clk_get_optional_enabled() to simplify the code (Geert Uytterhoeven) - build warning fix to allow the kernel to be built with CONFIG_WERROR enabled (Michael Karcher) * tag 'sh-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux: sh: clk: Fix clk_enable() to return 0 on NULL clk sh: intc: Avoid spurious sizeof-pointer-div warning
Diffstat (limited to 'drivers')
-rw-r--r--drivers/sh/clk/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/clk/core.c b/drivers/sh/clk/core.c
index d996782a7106..7a73f5e4a1fc 100644
--- a/drivers/sh/clk/core.c
+++ b/drivers/sh/clk/core.c
@@ -295,7 +295,7 @@ int clk_enable(struct clk *clk)
int ret;
if (!clk)
- return -EINVAL;
+ return 0;
spin_lock_irqsave(&clock_lock, flags);
ret = __clk_enable(clk);