| Message ID | 1473761217-18905-1-git-send-email-tobias.regnery@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Tobias Regnery <tobias.regnery@gmail.com> Date: Tue, 13 Sep 2016 12:06:57 +0200 > In commit 9ee7b683ea63 we moved the enablement of msi interrupts earlier in > alx_init_intr. If there is an error in alx_alloc_rings, __alx_open returns > with an error but msi (or msi-x) interrupts stays enabled. Add a new error > label to disable msi (or msi-x) interrupts. > > Fixes: 9ee7b683ea63 ("alx: refactor msi enablement and disablement") > Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com> Applied.
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c index 9887cee434dd..c0f84b73574d 100644 --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c @@ -1028,7 +1028,7 @@ static int __alx_open(struct alx_priv *alx, bool resume) err = alx_alloc_rings(alx); if (err) - return err; + goto out_disable_adv_intr; alx_configure(alx); @@ -1049,6 +1049,8 @@ static int __alx_open(struct alx_priv *alx, bool resume) out_free_rings: alx_free_rings(alx); +out_disable_adv_intr: + alx_disable_advanced_intr(alx); return err; }
In commit 9ee7b683ea63 we moved the enablement of msi interrupts earlier in alx_init_intr. If there is an error in alx_alloc_rings, __alx_open returns with an error but msi (or msi-x) interrupts stays enabled. Add a new error label to disable msi (or msi-x) interrupts. Fixes: 9ee7b683ea63 ("alx: refactor msi enablement and disablement") Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com> --- drivers/net/ethernet/atheros/alx/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)