Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c12ec0a2 authored by Roel Kluin's avatar Roel Kluin Committed by Jens Axboe
Browse files

paride: fix off-by-one test 



With `while (j++ < PX_SPIN)' j reaches PX_SPIN + 1 after the loop.  This
is probably unlikely to produce a problem.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 39ad2bbb

drivers/block/paride/pcd.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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"