diff options
| author | James Morris <jmorris@namei.org> | 2009-08-05 18:55:03 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-05 18:55:03 -0400 |
| commit | 012a5299a29672039f42944a37984558393ef769 (patch) | |
| tree | de0815c67cf4156c32c8b552cd7448387cc391b0 /drivers/net/eepro.c | |
| parent | da34d4248bd2013ee64ce51e63ec0ebd1f32b46c (diff) | |
| parent | 90bc1a658a53f8832ee799685703977a450e5af9 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/eepro.c')
| -rw-r--r-- | drivers/net/eepro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index cc2ab6412c73..4f7003485348 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
| @@ -1784,7 +1784,7 @@ int __init init_module(void) | |||
| 1784 | printk(KERN_INFO "eepro_init_module: Auto-detecting boards (May God protect us...)\n"); | 1784 | printk(KERN_INFO "eepro_init_module: Auto-detecting boards (May God protect us...)\n"); |
| 1785 | } | 1785 | } |
| 1786 | 1786 | ||
| 1787 | for (i = 0; io[i] != -1 && i < MAX_EEPRO; i++) { | 1787 | for (i = 0; i < MAX_EEPRO && io[i] != -1; i++) { |
| 1788 | dev = alloc_etherdev(sizeof(struct eepro_local)); | 1788 | dev = alloc_etherdev(sizeof(struct eepro_local)); |
| 1789 | if (!dev) | 1789 | if (!dev) |
| 1790 | break; | 1790 | break; |