diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-31 18:52:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-31 18:52:20 +0200 |
| commit | 334c0ef6429f261c7f53dc035632435ffbc0c60d (patch) | |
| tree | aa3dc0d26424cde763a8507fcd2080e7cf456103 | |
| parent | Merge tag 'x86_urgent_for_v5.19' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | clk: sunxi-ng: Fix H6 RTC clock definition (diff) | |
| download | linux-334c0ef6429f261c7f53dc035632435ffbc0c60d.tar.xz linux-334c0ef6429f261c7f53dc035632435ffbc0c60d.zip | |
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
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
| -rw-r--r-- | drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c b/drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c index 29a8c710ae06..b7962e5149a5 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, }; |