[SCSI] nsp_cs: time_out reaches -1
authorRoel Kluin <roel.kluin@gmail.com>
Wed, 10 Jun 2009 19:56:59 +0000 (12:56 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Mon, 15 Jun 2009 15:09:31 +0000 (10:09 -0500)
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/pcmcia/nsp_cs.c

index 11a61ea8d5d917d8d6e8478313885ee99cb20ad8..70b60ade049eb6eec28612a0307a14284b9adb8b 100644 (file)
@@ -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));
        }