diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-22 10:37:23 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-22 10:37:23 +0300 |
| commit | 99ba2ad1db623df79456b8556b3f4900f394c8c2 (patch) | |
| tree | 2bf6a20de87f0a5b944fd69d53723fc4710d7b7e /drivers/soc/imx/soc-imx8m.c | |
| parent | 18e126e97c961f7a93823795c879d7c085fe5098 (diff) | |
| parent | 2241ab53cbb5cdb08a6b2d4688feb13971058f65 (diff) | |
| download | linux-99ba2ad1db623df79456b8556b3f4900f394c8c2.tar.xz | |
Merge 6.2-rc5 into char-misc-next
We need the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/soc/imx/soc-imx8m.c')
| -rw-r--r-- | drivers/soc/imx/soc-imx8m.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/imx/soc-imx8m.c b/drivers/soc/imx/soc-imx8m.c index 28144c699b0c..32ed9dc88e45 100644 --- a/drivers/soc/imx/soc-imx8m.c +++ b/drivers/soc/imx/soc-imx8m.c @@ -66,8 +66,8 @@ static u32 __init imx8mq_soc_revision(void) ocotp_base = of_iomap(np, 0); WARN_ON(!ocotp_base); clk = of_clk_get_by_name(np, NULL); - if (!clk) { - WARN_ON(!clk); + if (IS_ERR(clk)) { + WARN_ON(IS_ERR(clk)); return 0; } |