Commit dc8bf1b1 authored by Andre Detsch's avatar Andre Detsch Committed by David S. Miller
Browse files

tg3: Fix INTx fallback when MSI fails



tg3: Fix INTx fallback when MSI fails

MSI setup changes the value of irq_vec in struct tg3 *tp.
This attribute must be taken into account and restored before
we try to do a new request_irq for INTx fallback.

In powerpc, the original code was leading to an EINVAL return within
request_irq, because the driver was trying to use the disabled MSI
virtual irq number instead of tp->pdev->irq.

Signed-off-by: default avatarAndre Detsch <adetsch@br.ibm.com>
Acked-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6443bb1f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -8633,6 +8633,7 @@ static int tg3_test_msi(struct tg3 *tp)
	pci_disable_msi(tp->pdev);

	tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI;
	tp->napi[0].irq_vec = tp->pdev->irq;

	err = tg3_request_irq(tp, 0);
	if (err)