diff options
| author | Andre Detsch <adetsch@br.ibm.com> | 2010-04-26 09:27:07 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-26 20:15:49 +0200 |
| commit | dc8bf1b1a6edfc92465526de19772061302f0929 (patch) | |
| tree | 540352807d398aee08c4180cc50d088e15c547ec /drivers/net/tg3.c | |
| parent | ipv6: Fix inet6_csk_bind_conflict() (diff) | |
| download | linux-dc8bf1b1a6edfc92465526de19772061302f0929.tar.xz linux-dc8bf1b1a6edfc92465526de19772061302f0929.zip | |
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: Andre Detsch <adetsch@br.ibm.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
| -rw-r--r-- | drivers/net/tg3.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 22cf1c446de3..ecc41cffb470 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -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) |