Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6] / drivers / net / ne2k-pci.c

diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index e531a4eedfeee3fd046beb4c7df5e3cb03be0da8..ced9fdb8335cc4225639cf49d67612d066833a31 100644 (file)
--- 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)
 {
        struct net_device *dev = pci_get_drvdata(pdev);
 
-       if (!dev)
-               BUG();
-
+       BUG_ON(!dev);
        unregister_netdev(dev);
        release_region(dev->base_addr, NE_IO_EXTENT);
        free_netdev(dev);
@@ -675,7 +673,6 @@ static int ne2k_pci_resume (struct pci_dev *pdev)
        pci_set_power_state(pdev, 0);
        pci_restore_state(pdev);
        pci_enable_device(pdev);
-       pci_set_master(pdev);
        NS8390_init(dev, 1);
        netif_device_attach(dev);