diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:55:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:55:50 -0400 |
| commit | 61cca8c72eb284e80876bafdea057055f6e793e4 (patch) | |
| tree | 5bb92477b811e64e88c9f0c119acb2c9e9804c91 /drivers/net/pcnet32.c | |
| parent | e494f6333bef20fd9d8689062260c5d0136a3ea0 (diff) | |
| parent | e254e9bff5283aad1af6d74d2a312ee011b84d61 (diff) | |
Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/pcnet32.c')
| -rw-r--r-- | drivers/net/pcnet32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 13f114876965..3213f3e50487 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
| @@ -850,7 +850,7 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data) | |||
| 850 | if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))) | 850 | if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))) |
| 851 | data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ); | 851 | data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ); |
| 852 | 852 | ||
| 853 | schedule_timeout(data * HZ); | 853 | msleep_interruptible(data * 1000); |
| 854 | del_timer_sync(&lp->blink_timer); | 854 | del_timer_sync(&lp->blink_timer); |
| 855 | 855 | ||
| 856 | /* Restore the original value of the bcrs */ | 856 | /* Restore the original value of the bcrs */ |