diff options
Diffstat (limited to 'drivers/net/pcnet32.c')
-rw-r--r-- | drivers/net/pcnet32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index c1bef953bf0..665a4286da3 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -2282,7 +2282,7 @@ static int pcnet32_open(struct net_device *dev) | |||
2282 | if (lp->chip_version >= PCNET32_79C970A) { | 2282 | if (lp->chip_version >= PCNET32_79C970A) { |
2283 | /* Print the link status and start the watchdog */ | 2283 | /* Print the link status and start the watchdog */ |
2284 | pcnet32_check_media(dev, 1); | 2284 | pcnet32_check_media(dev, 1); |
2285 | mod_timer(&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT); | 2285 | mod_timer(&lp->watchdog_timer, PCNET32_WATCHDOG_TIMEOUT); |
2286 | } | 2286 | } |
2287 | 2287 | ||
2288 | i = 0; | 2288 | i = 0; |
@@ -2917,7 +2917,7 @@ static void pcnet32_watchdog(struct net_device *dev) | |||
2917 | pcnet32_check_media(dev, 0); | 2917 | pcnet32_check_media(dev, 0); |
2918 | spin_unlock_irqrestore(&lp->lock, flags); | 2918 | spin_unlock_irqrestore(&lp->lock, flags); |
2919 | 2919 | ||
2920 | mod_timer(&(lp->watchdog_timer), PCNET32_WATCHDOG_TIMEOUT); | 2920 | mod_timer(&lp->watchdog_timer, round_jiffies(PCNET32_WATCHDOG_TIMEOUT)); |
2921 | } | 2921 | } |
2922 | 2922 | ||
2923 | static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state) | 2923 | static int pcnet32_pm_suspend(struct pci_dev *pdev, pm_message_t state) |