Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

334c0ef6 · Linus Torvalds <[email protected]> · 2022-07-31 09:52:20 -07:00

Pull clk fix from Stephen Boyd:
 "One-liner fix of a NULL pointer deref in the Allwinner clk driver"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: sunxi-ng: Fix H6 RTC clock definition

Commit: 334c0ef6429f261c7f53dc035632435ffbc0c60d
Parents: 89caf575 · 8dc592c4

Merge commit. Changes below are compared with the first parent: 89caf575.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c	modified	+1	−0	View file

drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c

View file

diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c
index 29a8c71..b7962e5 100644
--- a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c
+++ b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c
@@ -138,6 +138,7 @@ static struct ccu_common *sun50i_h6_r_ccu_clks[] = {
 	&r_apb2_rsb_clk.common,
 	&r_apb1_ir_clk.common,
 	&r_apb1_w1_clk.common,
+	&r_apb1_rtc_clk.common,
 	&ir_clk.common,
 	&w1_clk.common,
 };