diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 17:10:34 -0400 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /drivers/net/ne2k-pci.c | |
| parent | 34ddf733c415a8e336c996a4303d9f336e0c81b5 (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); |