Skip to content

Commit 27ac6e5

Browse files
ychuang3smb49
authored andcommitted
tty: serial: ma35d1: Add a NULL check for of_node
BugLink: https://bugs.launchpad.net/bugs/2078289 commit acd09ac upstream. 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: 930cbf9 ("tty: serial: Add Nuvoton ma35d1 serial driver support") Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/all/8df7ce45-fd58-4235-88f7-43fe7cd67e8f@moroto.mountain/ Signed-off-by: Jacky Huang <ychuang3@nuvoton.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Cc: stable <stable@kernel.org> Link: https://lore.kernel.org/r/20240625064128.127-1-ychuang570808@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Portia Stephens <portia.stephens@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 384f2a9 commit 27ac6e5

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

drivers/tty/serial/ma35d1_serial.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -688,12 +688,13 @@ static int ma35d1serial_probe(struct platform_device *pdev)
688688
struct uart_ma35d1_port *up;
689689
int ret = 0;
690690

691-
if (pdev->dev.of_node) {
692-
ret = of_alias_get_id(pdev->dev.of_node, "serial");
693-
if (ret < 0) {
694-
dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", ret);
695-
return ret;
696-
}
691+
if (!pdev->dev.of_node)
692+
return -ENODEV;
693+
694+
ret = of_alias_get_id(pdev->dev.of_node, "serial");
695+
if (ret < 0) {
696+
dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", ret);
697+
return ret;
697698
}
698699
up = &ma35d1serial_ports[ret];
699700
up->port.line = ret;

0 commit comments

Comments
 (0)