diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
| commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
| tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /drivers/parport | |
| parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/ieee1284.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c index ac2a805ac7ea..8901ecf6e037 100644 --- a/drivers/parport/ieee1284.c +++ b/drivers/parport/ieee1284.c | |||
| @@ -84,7 +84,7 @@ int parport_wait_event (struct parport *port, signed long timeout) | |||
| 84 | 84 | ||
| 85 | add_timer (&timer); | 85 | add_timer (&timer); |
| 86 | ret = down_interruptible (&port->physport->ieee1284.irq); | 86 | ret = down_interruptible (&port->physport->ieee1284.irq); |
| 87 | if (!del_timer (&timer) && !ret) | 87 | if (!del_timer_sync(&timer) && !ret) |
| 88 | /* Timed out. */ | 88 | /* Timed out. */ |
| 89 | ret = 1; | 89 | ret = 1; |
| 90 | 90 | ||