diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /drivers/net/ne2k-pci.c | |
| parent | 8628de0583504138551a05ad44ca388467f0f552 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/ne2k-pci.c')
| -rw-r--r-- | drivers/net/ne2k-pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c index d11821dd86ed..ced9fdb8335c 100644 --- a/drivers/net/ne2k-pci.c +++ b/drivers/net/ne2k-pci.c | |||
| @@ -645,9 +645,7 @@ static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev) | |||
| 645 | { | 645 | { |
| 646 | struct net_device *dev = pci_get_drvdata(pdev); | 646 | struct net_device *dev = pci_get_drvdata(pdev); |
| 647 | 647 | ||
| 648 | if (!dev) | 648 | BUG_ON(!dev); |
| 649 | BUG(); | ||
| 650 | |||
| 651 | unregister_netdev(dev); | 649 | unregister_netdev(dev); |
| 652 | release_region(dev->base_addr, NE_IO_EXTENT); | 650 | release_region(dev->base_addr, NE_IO_EXTENT); |
| 653 | free_netdev(dev); | 651 | free_netdev(dev); |