Skip to contentSkip to conversation

pinctrl: imx: Fix NULL dereference in imx_pinctrl_probe()

PATCH Applied Jesse Taube 2 participants 2 messages Jan 17, 2025 – Jan 20, 2025

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: imx: Fix NULL dereference in imx_pinctrl_probe()

When converting to ofnode ofnode_read_u32 was accedentally used to replace fdtdec_get_int instead of ofnode_read_u32_default. Use ofnode_read_u32_default to fix this.

Fixes 59382d2 ("pinctrl: imx: Convert to use livetree API for fdt access")
---
 drivers/pinctrl/nxp/pinctrl-imx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx.c +2 -2
index b1960c56b51..54cec37327c 100644
@@ -219,7 +219,7 @@ int imx_pinctrl_probe(struct udevice *dev,
 	if (info->flags & IMX8_USE_SCU)
 		return 0;
 
-	addr = ofnode_get_addr_size_index(dev_ofnode(dev), 0, &size);
+	addr = ofnode_get_addr_size_index(node, 0, &size);
 	if (addr == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
@@ -228,7 +228,7 @@ int imx_pinctrl_probe(struct udevice *dev,
 		return -ENOMEM;
 	priv->info = info;
 
-	info->mux_mask = ofnode_read_u32(node, "fsl,mux_mask", 0);
+	info->mux_mask = ofnode_read_u32_default(node, "fsl,mux_mask", 0);
 	/*
 	 * Refer to linux documentation for details:
 	 * Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt
Signature · 1 line
2.45.2
maintainer Applied
#1 lore raw
Quoted 7 lines · Jesse Taube

When converting to ofnode ofnode_read_u32 was accedentally used to replace fdtdec_get_int instead of ofnode_read_u32_default. Use ofnode_read_u32_default to fix this.

Fixes 59382d2 ("pinctrl: imx: Convert to use livetree API for fdt access")

Applied, thanks.