From: Marc Kleine-Budde Date: Thu, 19 Nov 2020 12:03:53 +0000 (+0100) Subject: can: gs_usb: gs_make_candev(): call SET_NETDEV_DEV() after handling all bt_const... X-Git-Tag: v5.18-rc1~136^2~127^2~14 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e0d25759fa917784da4399e426df4d7b822bbc3f;p=linux-2.6-block.git can: gs_usb: gs_make_candev(): call SET_NETDEV_DEV() after handling all bt_const->feature This patch moves the call to SET_NETDEV_DEV() after all handling (including cleanup) of the bt_const->feature is done. This looks more consistent. Link: https://lore.kernel.org/all/20220309124132.291861-8-mkl@pengutronix.de Signed-off-by: Marc Kleine-Budde --- diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index 7ba492150cdb..fa370549bd9e 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -849,14 +849,14 @@ static struct gs_can *gs_make_candev(unsigned int channel, if (feature & GS_CAN_FEATURE_ONE_SHOT) dev->can.ctrlmode_supported |= CAN_CTRLMODE_ONE_SHOT; - SET_NETDEV_DEV(netdev, &intf->dev); - if (le32_to_cpu(dconf->sw_version) > 1) if (feature & GS_CAN_FEATURE_IDENTIFY) netdev->ethtool_ops = &gs_usb_ethtool_ops; kfree(bt_const); + SET_NETDEV_DEV(netdev, &intf->dev); + rc = register_candev(dev->netdev); if (rc) { free_candev(dev->netdev);