| From 36732339e1abb407cea969eb2476c0674268c650 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 21 Feb 2022 22:59:35 +0000 |
| Subject: can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device |
| when fully ready |
| |
| From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> |
| |
| [ Upstream commit c5048a7b2c23ab589f3476a783bd586b663eda5b ] |
| |
| Register the CAN device only when all the necessary initialization is |
| completed. This patch makes sure all the data structures and locks are |
| initialized before registering the CAN device. |
| |
| Link: https://lore.kernel.org/all/20220221225935.12300-1-prabhakar.mahadev-lad.rj@bp.renesas.com |
| Reported-by: Pavel Machek <pavel@denx.de> |
| Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> |
| Reviewed-by: Pavel Machek <pavel@denx.de> |
| Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> |
| Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/can/rcar/rcar_canfd.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c |
| index 786d852a70d5..a1634834b640 100644 |
| --- a/drivers/net/can/rcar/rcar_canfd.c |
| +++ b/drivers/net/can/rcar/rcar_canfd.c |
| @@ -1602,15 +1602,15 @@ static int rcar_canfd_channel_probe(struct rcar_canfd_global *gpriv, u32 ch, |
| |
| netif_napi_add(ndev, &priv->napi, rcar_canfd_rx_poll, |
| RCANFD_NAPI_WEIGHT); |
| + spin_lock_init(&priv->tx_lock); |
| + devm_can_led_init(ndev); |
| + gpriv->ch[priv->channel] = priv; |
| err = register_candev(ndev); |
| if (err) { |
| dev_err(&pdev->dev, |
| "register_candev() failed, error %d\n", err); |
| goto fail_candev; |
| } |
| - spin_lock_init(&priv->tx_lock); |
| - devm_can_led_init(ndev); |
| - gpriv->ch[priv->channel] = priv; |
| dev_info(&pdev->dev, "device registered (channel %u)\n", priv->channel); |
| return 0; |
| |
| -- |
| 2.34.1 |
| |