Commit 0ca4e20b authored Sep 13, 2016 by Tobias Regnery Committed by David S. Miller Sep 15, 2016

alx: fix error handling in __alx_open

In commit 9ee7b683 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: 9ee7b683 ("alx: refactor msi enablement and disablement")
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5400e54a

drivers/net/ethernet/atheros/alx/main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}