diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/dgrs.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index 7809838e6c4c..2a290cc397ad 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c | |||
@@ -1549,7 +1549,7 @@ MODULE_PARM_DESC(nicmode, "Digi RightSwitch operating mode (1: switch, 2: multi- | |||
1549 | static int __init dgrs_init_module (void) | 1549 | static int __init dgrs_init_module (void) |
1550 | { | 1550 | { |
1551 | int i; | 1551 | int i; |
1552 | int eisacount = 0, pcicount = 0; | 1552 | int cardcount = 0; |
1553 | 1553 | ||
1554 | /* | 1554 | /* |
1555 | * Command line variable overrides | 1555 | * Command line variable overrides |
@@ -1591,15 +1591,13 @@ static int __init dgrs_init_module (void) | |||
1591 | * Find and configure all the cards | 1591 | * Find and configure all the cards |
1592 | */ | 1592 | */ |
1593 | #ifdef CONFIG_EISA | 1593 | #ifdef CONFIG_EISA |
1594 | eisacount = eisa_driver_register(&dgrs_eisa_driver); | 1594 | cardcount = eisa_driver_register(&dgrs_eisa_driver); |
1595 | if (eisacount < 0) | 1595 | if (cardcount < 0) |
1596 | return eisacount; | 1596 | return cardcount; |
1597 | #endif | ||
1598 | #ifdef CONFIG_PCI | ||
1599 | pcicount = pci_register_driver(&dgrs_pci_driver); | ||
1600 | if (pcicount) | ||
1601 | return pcicount; | ||
1602 | #endif | 1597 | #endif |
1598 | cardcount = pci_register_driver(&dgrs_pci_driver); | ||
1599 | if (cardcount) | ||
1600 | return cardcount; | ||
1603 | return 0; | 1601 | return 0; |
1604 | } | 1602 | } |
1605 | 1603 | ||