]> git.itanic.dy.fi Git - linux-stable/commitdiff
can: dev: can_restart(): move debug message and stats after successful restart
authorMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 29 Sep 2023 08:18:02 +0000 (10:18 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Thu, 5 Oct 2023 19:33:41 +0000 (21:33 +0200)
Move the debug message "restarted" and the CAN restart stats_after_
the successful restart of the CAN device, because the restart may
fail.

While there update the error message from printing the error number to
printing symbolic error names.

Link: https://lore.kernel.org/all/20231005-can-dev-fix-can-restart-v2-4-91b5c1fd922c@pengutronix.de
Reviewed-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
[mkl: mention stats in subject and description, too]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/dev/dev.c

index 9014256c486a5d80c0755b71c39e8702848243c0..82b12902fc355c67df2dab303a322232fde3fa73 100644 (file)
@@ -147,15 +147,15 @@ static void can_restart(struct net_device *dev)
                netif_rx(skb);
        }
 
-       netdev_dbg(dev, "restarted\n");
-       priv->can_stats.restarts++;
-
        /* Now restart the device */
        netif_carrier_on(dev);
        err = priv->do_set_mode(dev, CAN_MODE_START);
        if (err) {
-               netdev_err(dev, "Error %d during restart", err);
+               netdev_err(dev, "Restart failed, error %pe\n", ERR_PTR(err));
                netif_carrier_off(dev);
+       } else {
+               netdev_dbg(dev, "Restarted\n");
+               priv->can_stats.restarts++;
        }
 }