diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-10-15 20:36:53 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-10-15 20:36:54 +0000 |
| commit | 76237ff95bf7691f115b1b08a1fbdfd61bc398b1 (patch) | |
| tree | d2794b9d8a4e89439f50f612b789d49dedd57c66 | |
| parent | b72cd67a0300f3a38e1121a91849b556fc31fad2 (diff) | |
| parent | 2cf59663660799ce16f4dfbed97cdceac7a7fa11 (diff) | |
| download | lwn-76237ff95bf7691f115b1b08a1fbdfd61bc398b1.tar.gz lwn-76237ff95bf7691f115b1b08a1fbdfd61bc398b1.zip | |
Merge tag 'reset-fixes-for-v6.12' of git://git.pengutronix.de/pza/linux into arm/fixes
Reset controller fixes for v6.12
Fix a NULL pointer dereference in reset-starfive-jh71x0 and replace two
accidental commas at line endings with semicolons in reset-npcm.
* tag 'reset-fixes-for-v6.12' of git://git.pengutronix.de/pza/linux:
reset: starfive: jh71x0: Fix accessing the empty member on JH7110 SoC
reset: npcm: convert comma to semicolon
Link: https://lore.kernel.org/r/20240930165733.1541936-1-p.zabel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/reset/reset-npcm.c | 4 | ||||
| -rw-r--r-- | drivers/reset/starfive/reset-starfive-jh71x0.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/reset/reset-npcm.c b/drivers/reset/reset-npcm.c index 8935ef95a2d1..a200cc8c7955 100644 --- a/drivers/reset/reset-npcm.c +++ b/drivers/reset/reset-npcm.c @@ -405,8 +405,8 @@ static int npcm_rc_probe(struct platform_device *pdev) if (!of_property_read_u32(pdev->dev.of_node, "nuvoton,sw-reset-number", &rc->sw_reset_number)) { if (rc->sw_reset_number && rc->sw_reset_number < 5) { - rc->restart_nb.priority = 192, - rc->restart_nb.notifier_call = npcm_rc_restart, + rc->restart_nb.priority = 192; + rc->restart_nb.notifier_call = npcm_rc_restart; ret = register_restart_handler(&rc->restart_nb); if (ret) dev_warn(&pdev->dev, "failed to register restart handler\n"); diff --git a/drivers/reset/starfive/reset-starfive-jh71x0.c b/drivers/reset/starfive/reset-starfive-jh71x0.c index 55bbbd2de52c..29ce3486752f 100644 --- a/drivers/reset/starfive/reset-starfive-jh71x0.c +++ b/drivers/reset/starfive/reset-starfive-jh71x0.c @@ -94,6 +94,9 @@ static int jh71x0_reset_status(struct reset_controller_dev *rcdev, void __iomem *reg_status = data->status + offset * sizeof(u32); u32 value = readl(reg_status); + if (!data->asserted) + return !(value & mask); + return !((value ^ data->asserted[offset]) & mask); } |