diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/block/ps2esdi.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/block/ps2esdi.c')
| -rw-r--r-- | drivers/block/ps2esdi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c index 305c89a00..766ea0a18 100644 --- a/drivers/block/ps2esdi.c +++ b/drivers/block/ps2esdi.c @@ -379,9 +379,9 @@ static void __init ps2esdi_geninit(void) reset_status = 0; reset_start = jiffies; while (!reset_status) { - esdi_timer.expires = HZ; + init_timer(&esdi_timer); + esdi_timer.expires = jiffies + HZ; esdi_timer.data = 0; - esdi_timer.next = esdi_timer.prev = NULL; add_timer(&esdi_timer); sleep_on(&ps2esdi_int); } |