diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-10 08:49:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-04-10 08:49:26 +0200 |
| commit | 5790d407daa30356669758180b68144a9518da0a (patch) | |
| tree | 8e1cf20718103f6593418b1e80b1f74a2cd15fb6 /drivers/net/ethernet/xircom/xirc2ps_cs.c | |
| parent | a8642cd11635a35a5f1dc31857887900d6610778 (diff) | |
| parent | 09a9639e56c01c7a00d6c0ca63f4c7c41abe075d (diff) | |
| download | linux-next-5790d407daa30356669758180b68144a9518da0a.tar.gz | |
Merge 6.3-rc6 into char-misc-next
We need it here to apply other char/misc driver changes to.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/xircom/xirc2ps_cs.c')
| -rw-r--r-- | drivers/net/ethernet/xircom/xirc2ps_cs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c index 894e92ef415b..9f505cf02d96 100644 --- a/drivers/net/ethernet/xircom/xirc2ps_cs.c +++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c @@ -503,6 +503,11 @@ static void xirc2ps_detach(struct pcmcia_device *link) { struct net_device *dev = link->priv; + struct local_info *local = netdev_priv(dev); + + netif_carrier_off(dev); + netif_tx_disable(dev); + cancel_work_sync(&local->tx_timeout_task); dev_dbg(&link->dev, "detach\n"); |