diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 12:13:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 12:13:23 -0800 |
| commit | 083384755252cde25af187acf1807a0f5edb901f (patch) | |
| tree | 27beb76ed915641d07f5dbdfbcf67c0715061f5a /drivers/net/sfc/nic.c | |
| parent | 35d9b0c906ad92d32a0b8db5daa6fabfcc2f068d (diff) | |
| parent | e8f149924a3111015d16dfbbb4816cfc75ba53cd (diff) | |
Merge branch 'sfc-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6
Diffstat (limited to 'drivers/net/sfc/nic.c')
| -rw-r--r-- | drivers/net/sfc/nic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c index 41c36b9a4244..67cb0c96838c 100644 --- a/drivers/net/sfc/nic.c +++ b/drivers/net/sfc/nic.c @@ -1418,6 +1418,12 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id) u32 queues; int syserr; + /* Could this be ours? If interrupts are disabled then the + * channel state may not be valid. + */ + if (!efx->legacy_irq_enabled) + return result; + /* Read the ISR which also ACKs the interrupts */ efx_readd(efx, ®, FR_BZ_INT_ISR0); queues = EFX_EXTRACT_DWORD(reg, 0, 31); |