Skip to contentSkip to conversation

tty: serial: ma35d1: Add a NULL check for of_node

PATCH In review Jacky Huang 2 participants 2 messages Jun 25, 2024 – Jul 1, 2024

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

PATCH v4 1/1 tty: serial: ma35d1: Add a NULL check for of_node

From: Jacky Huang <[email protected]>

The pdev->dev.of_node can be NULL if the "serial" node is absent. Add a NULL check to return an error in such cases.

Fixes 930cbf92db01 ("tty: serial: Add Nuvoton ma35d1 serial driver support")

---
V3 -> V4: Move the version info lines to the correct position. V2 -> V3: Added the "Reported-by:" line.
V1 -> V2: Added the "Fixes" line.

 drivers/tty/serial/ma35d1_serial.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/tty/serial/ma35d1_serial.c +7 -6
index 19f0a305cc43..3b4206e815fe 100644
@@ -688,12 +688,13 @@ static int ma35d1serial_probe(struct platform_device *pdev)
 	struct uart_ma35d1_port *up;
 	int ret = 0;
 
-	if (pdev->dev.of_node) {
-		ret = of_alias_get_id(pdev->dev.of_node, "serial");
-		if (ret < 0) {
-			dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", ret);
-			return ret;
-		}
+	if (!pdev->dev.of_node)
+		return -ENODEV;
+
+	ret = of_alias_get_id(pdev->dev.of_node, "serial");
+	if (ret < 0) {
+		dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", ret);
+		return ret;
 	}
 	up = &ma35d1serial_ports[ret];
 	up->port.line = ret;
Signature · 1 line
2.34.1
Reviewed-by on v4 1/1
#1 lore raw
Quoted 5 lines · Jacky Huang

From: Jacky Huang <[email protected]>

The pdev->dev.of_node can be NULL if the "serial" node is absent. Add a NULL check to return an error in such cases.

Quoted 8 lines
Fixes 930cbf92db01 ("tty: serial: Add Nuvoton ma35d1 serial driver support")

---
V3 -> V4: Move the version info lines to the correct position. V2 -> V3: Added the "Reported-by:" line.
V1 -> V2: Added the "Fixes" line.

Thanks!

regards,
dan carpenter