Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206731
b: refs/heads/master
c: b2a899e
h: refs/heads/master
i:
  206729: 15cb951
  206727: 16a6f60
v: v3
  • Loading branch information
Roland Dreier committed Aug 4, 2010
1 parent 484aba2 commit bacd30f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: df924f833c0389c9f5206b073e87e9f5f3e857d3
refs/heads/master: b2a899eaf3ab78cab380ef7e331c549d771cc2ca
26 changes: 12 additions & 14 deletions trunk/drivers/infiniband/hw/nes/nes.c
Original file line number Diff line number Diff line change
Expand Up @@ -661,23 +661,21 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
nes_notifiers_registered++;

/* Initialize network devices */
if ((netdev = nes_netdev_init(nesdev, mmio_regs)) == NULL) {
goto bail7;
}

/* Register network device */
ret = register_netdev(netdev);
if (ret) {
printk(KERN_ERR PFX "Unable to register netdev, ret = %d\n", ret);
nes_netdev_destroy(netdev);
goto bail7;
}
if ((netdev = nes_netdev_init(nesdev, mmio_regs)) == NULL)
goto bail7;

nes_print_macaddr(netdev);
/* Register network device */
ret = register_netdev(netdev);
if (ret) {
printk(KERN_ERR PFX "Unable to register netdev, ret = %d\n", ret);
nes_netdev_destroy(netdev);
goto bail7;
}

nesdev->netdev_count++;
nesdev->nesadapter->netdev_count++;
nes_print_macaddr(netdev);

nesdev->netdev_count++;
nesdev->nesadapter->netdev_count++;

printk(KERN_ERR PFX "%s: NetEffect RNIC driver successfully loaded.\n",
pci_name(pcidev));
Expand Down

0 comments on commit bacd30f

Please sign in to comment.