* [patch] 2.4.3-pre2: fix lp_read
@ 2001-03-06 17:00 Tim Waugh
0 siblings, 0 replies; only message in thread
From: Tim Waugh @ 2001-03-06 17:00 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel
This patch should make printer status readback a little less broken
than before.
2001-06-03 Tim Waugh <twaugh@redhat.com>
* drivers/char/lp.c (lp_read): The loop is broken. Remove it,
and restore 2.2.x behaviour.
--- linux/drivers/char/lp.c.readback Tue Mar 6 16:47:08 2001
+++ linux/drivers/char/lp.c Tue Mar 6 16:47:31 2001
@@ -344,26 +344,7 @@
return -EINTR;
parport_claim_or_block (lp_table[minor].dev);
-
- for (;;) {
- retval = parport_read (port, kbuf, count);
-
- if (retval)
- break;
-
- if (file->f_flags & O_NONBLOCK)
- break;
-
- /* Wait for an interrupt. */
- interruptible_sleep_on_timeout (&lp_table[minor].waitq,
- LP_TIMEOUT_POLLED);
-
- if (signal_pending (current)) {
- retval = -EINTR;
- break;
- }
- }
-
+ retval = parport_read (port, kbuf, count);
parport_release (lp_table[minor].dev);
if (retval > 0 && copy_to_user (buf, kbuf, retval))
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2001-03-06 17:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2001-03-06 17:00 [patch] 2.4.3-pre2: fix lp_read Tim Waugh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox