diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-31 04:22:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-31 04:22:43 +0200 |
| commit | df597efb5737063497f1a4f7c996cc9aec294230 (patch) | |
| tree | 17bb60f68ee299d9717038197a932501625f1621 /drivers/net/tokenring/ibmtr.c | |
| parent | xfrm: select sane defaults for xfrm[4|6] gc_thresh (diff) | |
| parent | ixgbe: Fix RSC completion delay causing Rx interrupts to stop (diff) | |
| download | linux-df597efb5737063497f1a4f7c996cc9aec294230.tar.xz linux-df597efb5737063497f1a4f7c996cc9aec294230.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 6472ba5cfc5e..96d00c8f8d3e 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c @@ -1912,7 +1912,7 @@ static int __init ibmtr_init(void) find_turbo_adapters(io); - for (i = 0; io[i] && (i < IBMTR_MAX_ADAPTERS); i++) { + for (i = 0; i < IBMTR_MAX_ADAPTERS && io[i]; i++) { struct net_device *dev; irq[i] = 0; mem[i] = 0; |