nfsd: minor nfsd_vfs_write cleanup

[safe/jmp/linux-2.6] / drivers / parport / ieee1284.c

diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c
index 0338b09..8901ecf 100644 (file)
--- a/drivers/parport/ieee1284.c
+++ b/drivers/parport/ieee1284.c
@@ -1,4 +1,4 @@
-/* $Id: parport_ieee1284.c,v 1.4 1997/10/19 21:37:21 philip Exp $
+/*
  * IEEE-1284 implementation for parport.
  *
  * Authors: Phil Blundell <philb@gnu.org>
@@ -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;
 
@@ -199,8 +199,6 @@ int parport_wait_peripheral(struct parport *port,
        /* 40ms of slow polling. */
        deadline = jiffies + msecs_to_jiffies(40);
        while (time_before (jiffies, deadline)) {
-               int ret;
-
                if (signal_pending (current))
                        return -EINTR;