diff options
| author | Andre Detsch <adetsch@br.ibm.com> | 2010-04-26 07:27:07 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-12 14:57:13 -0700 |
| commit | 47d6fa8014314cf139d407840a85a1bd14588561 (patch) | |
| tree | b50453c69ce20a83a72f82a17fbdbf87b3c69906 /drivers | |
| parent | 6f12efee9e86b52193aa2e7e14ad013fc3153a8a (diff) | |
tg3: Fix INTx fallback when MSI fails
commit dc8bf1b1a6edfc92465526de19772061302f0929 upstream.
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>
Cc: Brandon Philips <bphilips@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -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 dcc1c23aab81..fd6622ca4cd5 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -8168,6 +8168,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) |