1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 527f9dcc7f69..50e1ec67ef9c 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -1576,7 +1576,7 @@ static int netdev_open(struct net_device *dev)
 
         /* Set the timer to check for link beat. */
         init_timer(&np->timer);
-        np->timer.expires = jiffies + NATSEMI_TIMER_FREQ;
+        np->timer.expires = round_jiffies(jiffies + NATSEMI_TIMER_FREQ);
         np->timer.data = (unsigned long)dev;
         np->timer.function = &netdev_timer; /* timer handler */
         add_timer(&np->timer);
@@ -1856,7 +1856,11 @@ static void netdev_timer(unsigned long data)
                         next_tick = 1;
                 }
         }
-        mod_timer(&np->timer, jiffies + next_tick);
+
+        if (next_tick > 1)
+                mod_timer(&np->timer, round_jiffies(jiffies + next_tick));
+        else
+                mod_timer(&np->timer, jiffies + next_tick);
 }
 
 static void dump_ring(struct net_device *dev)
@@ -3310,13 +3314,19 @@ static int natsemi_resume (struct pci_dev *pdev)
 {
         struct net_device *dev = pci_get_drvdata (pdev);
         struct netdev_private *np = netdev_priv(dev);
+        int ret = 0;
 
         rtnl_lock();
         if (netif_device_present(dev))
                 goto out;
         if (netif_running(dev)) {
                 BUG_ON(!np->hands_off);
-                pci_enable_device(pdev);
+                ret = pci_enable_device(pdev);
+                if (ret < 0) {
+                        dev_err(&pdev->dev,
+                                "pci_enable_device() failed: %d\n", ret);
+                        goto out;
+                }
         /*      pci_power_on(pdev); */
 
                 napi_enable(&np->napi);
@@ -3331,12 +3341,12 @@ static int natsemi_resume (struct pci_dev *pdev)
                 spin_unlock_irq(&np->lock);
                 enable_irq(dev->irq);
 
-                mod_timer(&np->timer, jiffies + 1*HZ);
+                mod_timer(&np->timer, round_jiffies(jiffies + 1*HZ));
         }
         netif_device_attach(dev);
 out:
         rtnl_unlock();
-        return 0;
+        return ret;
 }
 
 #endif /* CONFIG_PM */