Merge tag 'reset-fixes-for-v7.0' of https://git.pengutronix.de/git/pza/linux into arm/fixes

arndb · arndb · commit 22e6afddb5f9 · 2026-03-04T21:42:22.000+01:00
Reset controller fixes for v7.0 * Fix NULL pointer dereference in reset-rzg2l-usbphy-ctrl driver for renesas,rzg2l-usbphy-ctrl devices without pwrrdy control. * tag 'reset-fixes-for-v7.0' of https://git.pengutronix.de/git/pza/linux: reset: rzg2l-usbphy-ctrl: Check pwrrdy is valid before using it Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/drivers/reset/reset-rzg2l-usbphy-ctrl.c b/drivers/reset/reset-rzg2l-usbphy-ctrl.c
@@ -136,6 +136,9 @@ static int rzg2l_usbphy_ctrl_set_pwrrdy(struct regmap_field *pwrrdy,
 {
 	u32 val = power_on ? 0 : 1;
 
+	if (!pwrrdy)
+		return 0;
+
 	/* The initialization path guarantees that the mask is 1 bit long. */
 	return regmap_field_update_bits(pwrrdy, 1, val);
 }

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,9 @@ static int rzg2l_usbphy_ctrl_set_pwrrdy(struct regmap_field *pwrrdy,`
`136`	`136`	`{`
`137`	`137`	`u32 val = power_on ? 0 : 1;`
`138`	`138`
	`139`	`+ if (!pwrrdy)`
	`140`	`+ return 0;`
	`141`	`+`
`139`	`142`	`/* The initialization path guarantees that the mask is 1 bit long. */`
`140`	`143`	`return regmap_field_update_bits(pwrrdy, 1, val);`
`141`	`144`	`}`