drivers: net: xgene: disable napi when register irq failed in xgene_enet_open()
authorZhengchao Shao <shaozhengchao@huawei.com>
Mon, 7 Nov 2022 04:30:32 +0000 (12:30 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Nov 2022 16:35:36 +0000 (17:35 +0100)
[ Upstream commit ce9e57feeed81d17d5e80ed86f516ff0d39c3867 ]

When failed to register irq in xgene_enet_open() for opening device,
napi isn't disabled. When open xgene device next time, it will reports
a invalid opcode issue. Fix it. Only be compiled, not be tested.

Fixes: aeb20b6b3f4e ("drivers: net: xgene: fix: ifconfig up/down crash")
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Link: https://lore.kernel.org/r/20221107043032.357673-1-shaozhengchao@huawei.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/apm/xgene/xgene_enet_main.c

index 17c07837033f858d69fb1d484dea0ba73858ef87..3eeae65bcc5adf857d97853326e07480fb6cb5bc 100644 (file)
@@ -805,8 +805,10 @@ static int xgene_enet_open(struct net_device *ndev)
 
        xgene_enet_napi_enable(pdata);
        ret = xgene_enet_register_irq(ndev);
-       if (ret)
+       if (ret) {
+               xgene_enet_napi_disable(pdata);
                return ret;
+       }
 
        if (ndev->phydev) {
                phy_start(ndev->phydev);