Merge tag 'block-5.15-2021-09-11' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / atm / eni.c

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index b574cce..422753d 100644 (file)
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2054,7 +2054,7 @@ static int eni_send(struct atm_vcc *vcc,struct sk_buff *skb)
        }
        submitted++;
        ATM_SKB(skb)->vcc = vcc;
-       tasklet_disable(&ENI_DEV(vcc->dev)->task);
+       tasklet_disable_in_atomic(&ENI_DEV(vcc->dev)->task);
        res = do_tx(skb);
        tasklet_enable(&ENI_DEV(vcc->dev)->task);
        if (res == enq_ok) return 0;