Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core

[karo-tx-linux.git] / drivers / parport / ieee1284.c

diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c
index ac2a805ac7ea642e6bea96fc14bdcbe7a832b3c0..8901ecf6e037c99ab8d514687f091c6e598ba8dd 100644 (file)
--- a/drivers/parport/ieee1284.c
+++ b/drivers/parport/ieee1284.c
@@ -84,7 +84,7 @@ int parport_wait_event (struct parport *port, signed long timeout)
 
        add_timer (&timer);
        ret = down_interruptible (&port->physport->ieee1284.irq);
-       if (!del_timer (&timer) && !ret)
+       if (!del_timer_sync(&timer) && !ret)
                /* Timed out. */
                ret = 1;