5 files changed, 18 insertions, 7 deletions

diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 9afa47edfc58..3c54014acece 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -2292,10 +2292,15 @@ static int eepro100_resume(struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata (pdev);
         struct speedo_private *sp = netdev_priv(dev);
         void __iomem *ioaddr = sp->regs;
+        int rc;
 
         pci_set_power_state(pdev, PCI_D0);
         pci_restore_state(pdev);
-        pci_enable_device(pdev);
+
+        rc = pci_enable_device(pdev);
+        if (rc)
+                return rc;
+
         pci_set_master(pdev);
 
         if (!netif_running(dev))
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 3450051ae56b..6bb48ba80964 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -671,7 +671,7 @@ static ssize_t natsemi_show_##_name(struct device *dev, \
 #define NATSEMI_CREATE_FILE(_dev, _name) \
          device_create_file(&_dev->dev, &dev_attr_##_name)
 #define NATSEMI_REMOVE_FILE(_dev, _name) \
-         device_create_file(&_dev->dev, &dev_attr_##_name)
+         device_remove_file(&_dev->dev, &dev_attr_##_name)
 
 NATSEMI_ATTR(dspcfg_workaround);
 
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index 995c0a5d4066..cfdeaf7aa163 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -669,10 +669,15 @@ static int ne2k_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 static int ne2k_pci_resume (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata (pdev);
+        int rc;
 
         pci_set_power_state(pdev, 0);
         pci_restore_state(pdev);
-        pci_enable_device(pdev);
+
+        rc = pci_enable_device(pdev);
+        if (rc)
+                return rc;
+
         NS8390_init(dev, 1);
         netif_device_attach(dev);
 
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index ec1c556a47ca..5d8c78ee2cd9 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -2833,6 +2833,8 @@ static int clock_rate_calc(uclong rate, uclong clock, int *br_io)
         int br, tc;
         int br_pwr, error;
 
+        *br_io = 0;
+
         if (rate == 0)
                 return (0);
 
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 35eded7ffb2d..1cc18e787a65 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -595,8 +595,8 @@ recv_frame( struct net_device  *dev )
 
         u32  crc = CRC32_INITIAL;
 
-        unsigned  framelen, frameno, ack;
-        unsigned  is_first, frame_ok;
+        unsigned  framelen = 0, frameno, ack;
+        unsigned  is_first, frame_ok = 0;
 
         if( check_fhdr( ioaddr, &framelen, &frameno, &ack, &is_first, &crc ) ) {
                 frame_ok = framelen > 4
@@ -604,8 +604,7 @@ recv_frame( struct net_device  *dev )
                         :  skip_tail( ioaddr, framelen, crc );
                 if( frame_ok )
                         interpret_ack( dev, ack );
-        } else
-                frame_ok = 0;
+        }
 
         outb( inb( ioaddr + CSR0 ) ^ CT_ZER, ioaddr + CSR0 );
         if( frame_ok ) {