diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /drivers/pnp | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/parport_probe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pnp/parport_probe.c b/drivers/pnp/parport_probe.c index 0e7b56294..7ffde6f53 100644 --- a/drivers/pnp/parport_probe.c +++ b/drivers/pnp/parport_probe.c @@ -1,4 +1,4 @@ -/* $Id: parport_probe.c,v 1.1.1.1 1997/06/01 03:17:25 ralf Exp $ +/* $Id: parport_probe.c,v 1.2 1997/07/29 03:59:29 ralf Exp $ * Parallel port device probing code * * Authors: Carsten Gross, carsten@sol.wohnheim.uni-ulm.de @@ -86,15 +86,15 @@ static long read_polled(struct parport *port, char *buf, static struct wait_queue *wait_q = NULL; -static int wakeup(void *ref) +static void wakeup(void *ref) { struct pardevice **dev = (struct pardevice **)ref; if (!wait_q || parport_claim(*dev)) - return 1; + return; wake_up(&wait_q); - return 0; + return; } int parport_probe(struct parport *port, char *buffer, int len) |