On 07/01/13 23:28, Dan Carpenter wrote: > The 6e36308a6f "fb: fix atyfb build warning" isn't right. It makes all > the indexes off by one. This patch reverts it and casts the > ARRAY_SIZE() to int to silence the build warning. > > Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Tomi, My incorrect patch has been merged into mainline. Please merge Dan's fix for it instead. Thanks. > diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c > index a89c15d..9b0f12c 100644 > --- a/drivers/video/aty/atyfb_base.c > +++ b/drivers/video/aty/atyfb_base.c > @@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par) > const char *name; > int i; > > - for (i = ARRAY_SIZE(aty_chips); i > 0; i--) > - if (par->pci_id == aty_chips[i - 1].pci_id) > + for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--) > + if (par->pci_id == aty_chips[i].pci_id) > break; > > if (i < 0) > -- ~Randy -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
