diff options
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/ieee1284.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c index 54a6ef72906e..0338b0912674 100644 --- a/drivers/parport/ieee1284.c +++ b/drivers/parport/ieee1284.c | |||
@@ -76,7 +76,7 @@ int parport_wait_event (struct parport *port, signed long timeout) | |||
76 | semaphore. */ | 76 | semaphore. */ |
77 | return 1; | 77 | return 1; |
78 | 78 | ||
79 | init_timer (&timer); | 79 | init_timer_on_stack(&timer); |
80 | timer.expires = jiffies + timeout; | 80 | timer.expires = jiffies + timeout; |
81 | timer.function = timeout_waiting_on_port; | 81 | timer.function = timeout_waiting_on_port; |
82 | port_from_cookie[port->number % PARPORT_MAX] = port; | 82 | port_from_cookie[port->number % PARPORT_MAX] = port; |
@@ -88,6 +88,8 @@ int parport_wait_event (struct parport *port, signed long timeout) | |||
88 | /* Timed out. */ | 88 | /* Timed out. */ |
89 | ret = 1; | 89 | ret = 1; |
90 | 90 | ||
91 | destroy_timer_on_stack(&timer); | ||
92 | |||
91 | return ret; | 93 | return ret; |
92 | } | 94 | } |
93 | 95 | ||