scsi/pcmcia/nsp_cs: time_out reaches -1

PATCH In review [email protected] 1 participant 1 message May 12, 2009

Subsystems (2)

SCSI Ninja SCSI-3 / ninja SCSI-32Bi (16bit/CardBus) pcmcia SCSI host adapter driver

lore

Share & tools

lore

[email protected]

author

2009-05-12 21:32 UTC #0 lore raw

PATCH 7/9 scsi/pcmcia/nsp_cs: time_out reaches -1

From: Roel Kluin <[email protected]>

With a postfix decrement timeouts will reach -1 rather than 0, so the errors do not appear.

Signed-off-by Roel Kluin <[email protected]>

Cc James Bottomley <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/scsi/pcmcia/nsp_cs.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/scsi/pcmcia/nsp_cs.c renamed from drivers/scsi/pcmcia/nsp_cs.c~scsi-pcmcia-nsp_cs-time_out-reaches-1 +3 -3

diff -puN drivers/scsi/pcmcia/nsp_cs.c~scsi-pcmcia-nsp_cs-time_out-reaches-1 drivers/scsi/pcmcia/nsp_cs.c
@@ -530,7 +530,7 @@ static int nsp_negate_signal(struct scsi
 		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_cmn
 
 	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_cm
 
 	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));
 	}