paride: fix off-by-one test

[mv-sheeva.git] / drivers / block / paride / pf.c

diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index ea54ea393553831c6ba4a2066e9cb63859cd4e5b..c059aab3006b9a5c794e0b91814dd41d064c0052 100644 (file)
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -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"
@@ -956,8 +956,7 @@ static int __init pf_init(void)
                return -ENOMEM;
        }
 
-       blk_queue_max_phys_segments(pf_queue, cluster);
-       blk_queue_max_hw_segments(pf_queue, cluster);
+       blk_queue_max_segments(pf_queue, cluster);
 
        for (pf = units, unit = 0; unit < PF_UNITS; pf++, unit++) {
                struct gendisk *disk = pf->disk;