* [PATCH] scsi/pcmcia/nsp_cs: time_out reaches -1
[not found] <499948C3.2000500@gmail.com>
@ 2009-02-25 13:34 ` Roel Kluin
0 siblings, 0 replies; only message in thread
From: Roel Kluin @ 2009-02-25 13:34 UTC (permalink / raw)
To: yokota, James.Bottomley; +Cc: linux-pcmcia, linux-scsi, Andrew Morton
I sent the first in a previous patch, but didn't notice the other issues
below initially. (should I make a delta patch? and how do you do that?)
--------------------------->8-------------8<------------------------------
With a postfix decrement timeouts will reach -1 rather than 0, so the
errors do not appear.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 11a61ea..70b60ad 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -530,7 +530,7 @@ static int nsp_negate_signal(struct scsi_cmnd *SCpnt, unsigned char mask,
if (reg == 0xff) {
break;
}
- } while ((time_out-- != 0) && (reg & mask) != 0);
+ } while ((--time_out != 0) && (reg & mask) != 0);
if (time_out == 0) {
nsp_msg(KERN_DEBUG, " %s signal off timeut", str);
@@ -801,7 +801,7 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt)
data->FifoCount = ocount;
- if (time_out == 0) {
+ if (time_out < 0) {
nsp_msg(KERN_DEBUG, "pio read timeout resid=%d this_residual=%d buffers_residual=%d",
scsi_get_resid(SCpnt), SCpnt->SCp.this_residual,
SCpnt->SCp.buffers_residual);
@@ -897,7 +897,7 @@ static void nsp_pio_write(struct scsi_cmnd *SCpnt)
data->FifoCount = ocount;
- if (time_out == 0) {
+ if (time_out < 0) {
nsp_msg(KERN_DEBUG, "pio write timeout resid=0x%x",
scsi_get_resid(SCpnt));
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-02-25 13:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <499948C3.2000500@gmail.com>
2009-02-25 13:34 ` [PATCH] scsi/pcmcia/nsp_cs: time_out reaches -1 Roel Kluin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.