diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2020-11-19 13:03:53 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2022-03-10 09:49:14 +0100 |
| commit | e0d25759fa917784da4399e426df4d7b822bbc3f (patch) | |
| tree | d79a4ef819784e9a7105f71584f3284f1ddd27a9 /drivers/net/can | |
| parent | can: gs_usb: rewrap usb_control_msg() and usb_fill_bulk_urb() (diff) | |
| download | linux-e0d25759fa917784da4399e426df4d7b822bbc3f.tar.xz linux-e0d25759fa917784da4399e426df4d7b822bbc3f.zip | |
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 <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/usb/gs_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |