diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-04-30 09:55:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 17:29:53 +0200 |
| commit | c6f3a97f86a5c97be0ca255976110bb9c3cfe669 (patch) | |
| tree | 95a7bf3c928a85b26aed128786fc09e18bc5dcfc /drivers/parport/ieee1284.c | |
| parent | debugobjects: add documentation (diff) | |
| download | linux-c6f3a97f86a5c97be0ca255976110bb9c3cfe669.tar.xz linux-c6f3a97f86a5c97be0ca255976110bb9c3cfe669.zip | |
debugobjects: add timer specific object debugging code
Add calls to the generic object debugging infrastructure and provide fixup
functions which allow to keep the system alive when recoverable problems have
been detected by the object debugging core code.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Greg KH <greg@kroah.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parport/ieee1284.c')
| -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) semaphore. */ return 1; - init_timer (&timer); + init_timer_on_stack(&timer); timer.expires = jiffies + timeout; timer.function = timeout_waiting_on_port; port_from_cookie[port->number % PARPORT_MAX] = port; @@ -88,6 +88,8 @@ int parport_wait_event (struct parport *port, signed long timeout) /* Timed out. */ ret = 1; + destroy_timer_on_stack(&timer); + return ret; } |