disable_irq() after request_irq() still has a time gap in which
interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
disable IRQ auto-enable when request IRQ.

Signed-off-by: Jinjie Ruan <ruanjin...@huawei.com>
---
 drivers/net/ethernet/apple/bmac.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/apple/bmac.c 
b/drivers/net/ethernet/apple/bmac.c
index 292b1f9cd9e7..785f4b4ff758 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -1317,7 +1317,7 @@ static int bmac_probe(struct macio_dev *mdev, const 
struct of_device_id *match)
 
        timer_setup(&bp->tx_timeout, bmac_tx_timeout, 0);
 
-       ret = request_irq(dev->irq, bmac_misc_intr, 0, "BMAC-misc", dev);
+       ret = request_irq(dev->irq, bmac_misc_intr, IRQF_NO_AUTOEN, 
"BMAC-misc", dev);
        if (ret) {
                printk(KERN_ERR "BMAC: can't get irq %d\n", dev->irq);
                goto err_out_iounmap_rx;
@@ -1336,7 +1336,6 @@ static int bmac_probe(struct macio_dev *mdev, const 
struct of_device_id *match)
        /* Mask chip interrupts and disable chip, will be
         * re-enabled on open()
         */
-       disable_irq(dev->irq);
        pmac_call_feature(PMAC_FTR_BMAC_ENABLE, macio_get_of_node(bp->mdev), 0, 
0);
 
        if (register_netdev(dev) != 0) {
-- 
2.34.1


Reply via email to