diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2023-07-31 09:39:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2023-07-31 09:39:56 +0200 |
| commit | fe3015748a905e08eb0e1750aa2928f520063d59 (patch) | |
| tree | d15524d1f7931e8e5964e9ff8368792d09282da5 /drivers/net/can | |
| parent | parport_pc: add support for ASIX AX99100 (diff) | |
| parent | Linux 6.5-rc4 (diff) | |
| download | linux-fe3015748a905e08eb0e1750aa2928f520063d59.tar.gz linux-fe3015748a905e08eb0e1750aa2928f520063d59.tar.bz2 linux-fe3015748a905e08eb0e1750aa2928f520063d59.zip | |
Merge 6.5-rc4 into tty-next
We need the serial/tty fixes in here as well for testing and future
development.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/usb/gs_usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index f418066569fc..bd9eb066ecf1 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -1030,6 +1030,8 @@ static int gs_can_close(struct net_device *netdev) usb_kill_anchored_urbs(&dev->tx_submitted); atomic_set(&dev->active_tx_urbs, 0); + dev->can.state = CAN_STATE_STOPPED; + /* reset the device */ rc = gs_cmd_reset(dev); if (rc < 0) |