diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/pnp | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/parport_probe.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/pnp/parport_probe.c b/drivers/pnp/parport_probe.c index 82ba36ef1..32188af9e 100644 --- a/drivers/pnp/parport_probe.c +++ b/drivers/pnp/parport_probe.c @@ -76,7 +76,7 @@ static long read_polled(struct parport *port, char *buf, Byte |= (z<<4); if (temp) *(temp++) = Byte; - if (count++ == length) + if (++count == length) temp = NULL; /* Does the error line indicate end of data? */ if ((parport_read_status(port) & LP_PERRORP) == @@ -91,7 +91,7 @@ static long read_polled(struct parport *port, char *buf, int parport_probe(struct parport *port, char *buffer, int len) { - struct pardevice *dev = parport_register_device(port, "IEEE 1284 probe", NULL, NULL, NULL, PARPORT_DEV_TRAN, &dev); + struct pardevice *dev = parport_register_device(port, "IEEE 1284 probe", NULL, NULL, NULL, 0, &dev); int result = 0; @@ -105,9 +105,8 @@ int parport_probe(struct parport *port, char *buffer, int len) switch (parport_ieee1284_nibble_mode_ok(port, 4)) { case 1: current->state=TASK_INTERRUPTIBLE; - current->timeout=jiffies+1; - schedule(); /* HACK: wait 10ms because printer seems to - * ack wrong */ + /* HACK: wait 10ms because printer seems to ack wrong */ + schedule_timeout((HZ+99)/100); result = read_polled(port, buffer, len); break; case 0: |