On Sun, 2009-08-02 at 10:02 +0200, Roel Kluin wrote: > Check whether index is within bounds before testing the element. > > Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx> > --- > This also removes the likely, should it be kept? > > diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c > index f9f9a5f..13a64bc 100644 > --- a/drivers/parisc/pdc_stable.c > +++ b/drivers/parisc/pdc_stable.c > @@ -370,7 +370,7 @@ pdcspath_layer_read(struct pdcspath_entry *entry, char *buf) > if (!i) /* entry is not ready */ > return -ENODATA; > > - for (i = 0; devpath->layers[i] && (likely(i < 6)); i++) > + for (i = 0; i < 6 && devpath->layers[i]; i++) Since all patterns like this (swapping the order of conditions with no side effects in a for loop condition) are basically trivial, shouldn't they be going via Jiri Kosina (trivial tree)? James -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html