From fa9143222d4998f0c56a62cb4741093798332854 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Tue, 6 Jan 2009 14:43:14 -0800
Subject: [PATCH] --- yaml --- r: 126422 b: refs/heads/master c:
 f59abb161c955b68fd3d473368420c5919733e09 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/parport/ieee1284.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ca8abe4de724..f25d33d300ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50682bb4de35544466c264c017030de826614367
+refs/heads/master: f59abb161c955b68fd3d473368420c5919733e09
diff --git a/trunk/drivers/parport/ieee1284.c b/trunk/drivers/parport/ieee1284.c
index ac2a805ac7ea..8901ecf6e037 100644
--- a/trunk/drivers/parport/ieee1284.c
+++ b/trunk/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;