Skip to content

Commit 9650910

Browse files
committed
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "Two small fixes - Initialize a spinlock in the stm32 reset code - Add dt bindings to the clk maintainer filepattern" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: MAINTAINERS: add include/dt-bindings/clock to COMMON CLK FRAMEWORK clk: stm32: rcc_reset: Fix missing spin_lock_init()
2 parents a175eca + a79e69c commit 9650910

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4976,6 +4976,7 @@ Q: http://patchwork.kernel.org/project/linux-clk/list/
49764976
T: git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
49774977
F: Documentation/devicetree/bindings/clock/
49784978
F: drivers/clk/
4979+
F: include/dt-bindings/clock/
49794980
F: include/linux/clk-pr*
49804981
F: include/linux/clk/
49814982
F: include/linux/of_clk.h

drivers/clk/stm32/reset-stm32.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ int stm32_rcc_reset_init(struct device *dev, const struct of_device_id *match,
111111
if (!reset_data)
112112
return -ENOMEM;
113113

114+
spin_lock_init(&reset_data->lock);
114115
reset_data->membase = base;
115116
reset_data->rcdev.owner = THIS_MODULE;
116117
reset_data->rcdev.ops = &stm32_reset_ops;

0 commit comments

Comments
 (0)