Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9057
b: refs/heads/master
c: 22abe31
h: refs/heads/master
i:
  9055: 120cc43
v: v3
  • Loading branch information
Peter Hagervall authored and David S. Miller committed Sep 17, 2005
1 parent d2989e5 commit 405d83d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: a8f39143ac67ffa2e26ce48aaac6bf5dc7dae95f
refs/heads/master: 22abe310bc4b0c684fd3716af6b6116ff1011707
6 changes: 3 additions & 3 deletions trunk/drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -9534,7 +9534,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
tp->write32_rx_mbox = tg3_write_indirect_mbox;

iounmap(tp->regs);
tp->regs = 0;
tp->regs = NULL;

pci_read_config_word(tp->pdev, PCI_COMMAND, &pci_cmd);
pci_cmd &= ~PCI_COMMAND_MEMORY;
Expand Down Expand Up @@ -10682,7 +10682,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
err_out_iounmap:
if (tp->regs) {
iounmap(tp->regs);
tp->regs = 0;
tp->regs = NULL;
}

err_out_free_dev:
Expand All @@ -10707,7 +10707,7 @@ static void __devexit tg3_remove_one(struct pci_dev *pdev)
unregister_netdev(dev);
if (tp->regs) {
iounmap(tp->regs);
tp->regs = 0;
tp->regs = NULL;
}
free_netdev(dev);
pci_release_regions(pdev);
Expand Down

0 comments on commit 405d83d

Please sign in to comment.