diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-06-10 15:56:59 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-15 11:09:31 -0400 |
commit | 0454c7408ac533a0690cb308554a4ed304270c3d (patch) | |
tree | 866c98d36ea6b69e2905729d23d233e1216cb8a4 | |
parent | 18020ba7915efe5763c1cbb11f9f7e3f85b3cb72 (diff) |
[SCSI] nsp_cs: time_out reaches -1
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>
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 11a61ea8d5d9..70b60ade049e 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, | |||
530 | if (reg == 0xff) { | 530 | if (reg == 0xff) { |
531 | break; | 531 | break; |
532 | } | 532 | } |
533 | } while ((time_out-- != 0) && (reg & mask) != 0); | 533 | } while ((--time_out != 0) && (reg & mask) != 0); |
534 | 534 | ||
535 | if (time_out == 0) { | 535 | if (time_out == 0) { |
536 | nsp_msg(KERN_DEBUG, " %s signal off timeut", str); | 536 | nsp_msg(KERN_DEBUG, " %s signal off timeut", str); |
@@ -801,7 +801,7 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt) | |||
801 | 801 | ||
802 | data->FifoCount = ocount; | 802 | data->FifoCount = ocount; |
803 | 803 | ||
804 | if (time_out == 0) { | 804 | if (time_out < 0) { |
805 | nsp_msg(KERN_DEBUG, "pio read timeout resid=%d this_residual=%d buffers_residual=%d", | 805 | nsp_msg(KERN_DEBUG, "pio read timeout resid=%d this_residual=%d buffers_residual=%d", |
806 | scsi_get_resid(SCpnt), SCpnt->SCp.this_residual, | 806 | scsi_get_resid(SCpnt), SCpnt->SCp.this_residual, |
807 | SCpnt->SCp.buffers_residual); | 807 | SCpnt->SCp.buffers_residual); |
@@ -897,7 +897,7 @@ static void nsp_pio_write(struct scsi_cmnd *SCpnt) | |||
897 | 897 | ||
898 | data->FifoCount = ocount; | 898 | data->FifoCount = ocount; |
899 | 899 | ||
900 | if (time_out == 0) { | 900 | if (time_out < 0) { |
901 | nsp_msg(KERN_DEBUG, "pio write timeout resid=0x%x", | 901 | nsp_msg(KERN_DEBUG, "pio write timeout resid=0x%x", |
902 | scsi_get_resid(SCpnt)); | 902 | scsi_get_resid(SCpnt)); |
903 | } | 903 | } |