leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SCSI] nsp_cs: time_out reaches -1

Browse Source 
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>
This commit is contained in:
Roel Kluin 2009-06-10 12:56:59 -07:00 committed by James Bottomley
parent 18020ba791
commit 0454c7408a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/pcmcia/nsp_cs.c
View File

@ -530,7 +530,7 @@ static int nsp_negate_signal(struct scsi_cmnd *SCpnt, unsigned char mask,
if (reg == 0xff) { if (reg == 0xff) {
break; break;
} }
} while ((time_out-- != 0) && (reg & mask) != 0); } while ((--time_out != 0) && (reg & mask) != 0);
if (time_out == 0) { if (time_out == 0) {
nsp_msg(KERN_DEBUG, " %s signal off timeut", str); 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; 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", nsp_msg(KERN_DEBUG, "pio read timeout resid=%d this_residual=%d buffers_residual=%d",
scsi_get_resid(SCpnt), SCpnt->SCp.this_residual, scsi_get_resid(SCpnt), SCpnt->SCp.this_residual,
SCpnt->SCp.buffers_residual); SCpnt->SCp.buffers_residual);
@ -897,7 +897,7 @@ static void nsp_pio_write(struct scsi_cmnd *SCpnt)
data->FifoCount = ocount; data->FifoCount = ocount;
if (time_out == 0) { if (time_out < 0) {
nsp_msg(KERN_DEBUG, "pio write timeout resid=0x%x", nsp_msg(KERN_DEBUG, "pio write timeout resid=0x%x",
scsi_get_resid(SCpnt)); scsi_get_resid(SCpnt));
} }