merged. Bruce
In message: [linux-yocto][linux-yocto v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc & v5.15/standard/nxp-sdk-5.15/nxp-soc][PATCH] serial: lpuart: remove redundant code on 21/10/2022 Xiaolei Wang wrote: > Due to 2e7fa78db49e merge conflict, the port was registered twice. > This would hang the system boot, delete the redundant code to > fix this issue. > > Signed-off-by: Xiaolei Wang <[email protected]> > --- > drivers/tty/serial/fsl_lpuart.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c > index d67811a9d3e8..30af65a3f3aa 100644 > --- a/drivers/tty/serial/fsl_lpuart.c > +++ b/drivers/tty/serial/fsl_lpuart.c > @@ -2938,10 +2938,6 @@ static int lpuart_probe(struct platform_device *pdev) > pm_runtime_set_active(&pdev->dev); > pm_runtime_enable(&pdev->dev); > > - ret = uart_add_one_port(&lpuart_reg, &sport->port); > - if (ret) > - goto failed_attach_port; > - > ret = lpuart_global_reset(sport); > if (ret) > goto failed_reset; > -- > 2.25.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11806): https://lists.yoctoproject.org/g/linux-yocto/message/11806 Mute This Topic: https://lists.yoctoproject.org/mt/94470639/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
