On Tue, Jun 11, 2024 at 09:22:51AM +0000, Jacky Huang wrote:
> From: Jacky Huang <ychuang3@xxxxxxxxxxx>
>
> 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.
>
> Signed-off-by: Jacky Huang <ychuang3@xxxxxxxxxxx>
> ---
> drivers/tty/serial/ma35d1_serial.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/tty/serial/ma35d1_serial.c b/drivers/tty/serial/ma35d1_serial.c
> index 19f0a305cc43..3b4206e815fe 100644
> --- a/drivers/tty/serial/ma35d1_serial.c
> +++ b/drivers/tty/serial/ma35d1_serial.c
> @@ -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;
What commit id does this fix?
thanks,
greg k-h
