paride: test off by one
PATCH 1/1 paride: test off by one
With `while (j++ < PX_SPIN)' j reaches PX_SPIN + 1 after the loop. This is probably unlikely to produce a problem.
Signed-off-by Roel Kluin <[email protected]>
--- drivers/block/paride/pcd.c | 2 +- drivers/block/paride/pf.c | 2 +- drivers/block/paride/pt.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/block/paride/pcd.c +1 -1
@@ -341,7 +341,7 @@ static int pcd_wait(struct pcd_unit *cd, int go, int stop, char *fun, char *msg) && (j++ < PCD_SPIN))udelay (PCD_DELAY ); -if ((r & (IDE_ERR & stop)) || (j >=PCD_SPIN )) { +if ((r & (IDE_ERR & stop)) || (j >PCD_SPIN )) { s =read_reg (cd,7 ); e =read_reg (cd,1 ); p =read_reg (cd,2 );
drivers/block/paride/pf.c +1 -1
@@ -391,7 +391,7 @@ static int pf_wait(struct pf_unit *pf, int go, int stop, char *fun, char *msg) && (j++ < PF_SPIN))udelay (PF_SPIN_DEL ); -if ((r & (STAT_ERR & stop)) || (j >=PF_SPIN )) { +if ((r & (STAT_ERR & stop)) || (j >PF_SPIN )) { s =read_reg (pf,7 ); e =read_reg (pf,1 ); p =read_reg (pf,2 );
drivers/block/paride/pt.c +1 -1
@@ -274,7 +274,7 @@ static int pt_wait(struct pt_unit *tape, int go, int stop, char *fun, char *msg) && (j++ < PT_SPIN))udelay (PT_SPIN_DEL ); -if ((r & (STAT_ERR & stop)) || (j >=PT_SPIN )) { +if ((r & (STAT_ERR & stop)) || (j >PT_SPIN )) { s =read_reg (pi,7 ); e =read_reg (pi,1 ); p =read_reg (pi,2 );
With `while (j++ < PX_SPIN)' j reaches PX_SPIN + 1 after the loop. This is probably unlikely to produce a problem.
Signed-off-by Roel Kluin <[email protected]>
---
If you want this, this is probably better:
drivers/block/paride/pcd.c +2 -2
@@ -341,11 +341,11 @@ static int pcd_wait(struct pcd_unit *cd, int go, int stop, char *fun, char *msg) && (j++ < PCD_SPIN))udelay (PCD_DELAY ); -if ((r & (IDE_ERR & stop)) || (j >=PCD_SPIN )) { +if ((r & (IDE_ERR & stop)) || (j >PCD_SPIN )) { s =read_reg (cd,7 ); e =read_reg (cd,1 ); p =read_reg (cd,2 ); -if (j >=PCD_SPIN ) +if (j >PCD_SPIN ) e |=0x100 ;if (fun) printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x"
drivers/block/paride/pf.c +2 -2
@@ -391,11 +391,11 @@ static int pf_wait(struct pf_unit *pf, int go, int stop, char *fun, char *msg) && (j++ < PF_SPIN))udelay (PF_SPIN_DEL ); -if ((r & (STAT_ERR & stop)) || (j >=PF_SPIN )) { +if ((r & (STAT_ERR & stop)) || (j >PF_SPIN )) { s =read_reg (pf,7 ); e =read_reg (pf,1 ); p =read_reg (pf,2 ); -if (j >=PF_SPIN ) +if (j >PF_SPIN ) e |=0x100 ;if (fun) printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x"
drivers/block/paride/pt.c +2 -2
@@ -274,11 +274,11 @@ static int pt_wait(struct pt_unit *tape, int go, int stop, char *fun, char *msg) && (j++ < PT_SPIN))udelay (PT_SPIN_DEL ); -if ((r & (STAT_ERR & stop)) || (j >=PT_SPIN )) { +if ((r & (STAT_ERR & stop)) || (j >PT_SPIN )) { s =read_reg (pi,7 ); e =read_reg (pi,1 ); p =read_reg (pi,2 ); -if (j >=PT_SPIN ) +if (j >PT_SPIN ) e |=0x100 ;if (fun) printk("%s: %s %s: alt=0x%x stat=0x%x err=0x%x"