git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
drivers
/
parport
/
ieee1284.c
diff --git
a/drivers/parport/ieee1284.c
b/drivers/parport/ieee1284.c
index
ac2a805
..
8901ecf
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;