Skip to contentSkip to conversation

scsi/pcmcia/nsp_cs: time_out reaches -1

PATCH New Roel Kluin 1 participant 1 message Feb 25, 2009 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Roel Kluin

author
#1 lore raw

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

In reply to a message not in the archive

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.

---

drivers/scsi/pcmcia/nsp_cs.c +3 -3
index 11a61ea..70b60ad 100644
@@ -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));
 	}