Skip to content

Commit 1cc30cf

Browse files
committed
Merge tag 'reset-fixes-for-v7.0-3' of https://git.pengutronix.de/git/pza/linux into arm/fixes
Reset controller fixes for v7.0, part 3 * Add missing reset ops for amlogic,t7-reset to the reset-meson driver. The resets are unused as of now, but as soon as they are, the driver would otherwise run into a NULL pointer dereference. * tag 'reset-fixes-for-v7.0-3' of https://git.pengutronix.de/git/pza/linux: reset: amlogic: t7: Fix null reset ops Signed-off-by: Krzysztof Kozlowski <[email protected]>
2 parents 90ac490 + 9797524 commit 1cc30cf

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

drivers/reset/amlogic/reset-meson.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ static const struct meson_reset_param meson_s4_param = {
4242
};
4343

4444
static const struct meson_reset_param t7_param = {
45+
.reset_ops = &meson_reset_ops,
4546
.reset_num = 224,
4647
.reset_offset = 0x0,
4748
.level_offset = 0x40,

0 commit comments

Comments
 (0)