Commit 57747b7f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (5476): Fix gpiomux array size 



there were several "magic" for loops, addressing gpiomux array size (4).
Adrian Bunk showed that one of the loops were wrong, going from 0 to 4.

This patch provides the right fix for this trouble, by using ARRAY_SIZE
on all places where we have a for loop using gpiomux.

Thanks to: Adrian Bunk <bunk@stusta.de> for pointing me about this trouble.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent f423b9a8

drivers/media/video/bt8xx/bttv-cards.c

+3 −3
Original line number Diff line number Diff line
@@ -2970,20 +2970,20 @@ void __devinit bttv_idcard(struct bttv *btv) 


	if (UNSET != audiomux[0]) {

		gpiobits = 0;

		for (i = 0; i < 4; i++) {

		for (i = 0; i < ARRAY_SIZE(bttv_tvcards->gpiomux); i++) {

			bttv_tvcards[btv->c.type].gpiomux[i] = audiomux[i];

			gpiobits |= audiomux[i];

		}

	} else {

		gpiobits = audioall;

		for (i = 0; i < 4; i++) {

		for (i = 0; i < ARRAY_SIZE(bttv_tvcards->gpiomux); i++) {

			bttv_tvcards[btv->c.type].gpiomux[i] = audioall;

		}

	}

	bttv_tvcards[btv->c.type].gpiomask = (UNSET != gpiomask) ? gpiomask : gpiobits;

	printk(KERN_INFO "bttv%d: gpio config override: mask=0x%x, mux=",

	       btv->c.nr,bttv_tvcards[btv->c.type].gpiomask);

	for (i = 0; i < 5; i++) {

	for (i = 0; i < ARRAY_SIZE(bttv_tvcards->gpiomux); i++) {

		printk("%s0x%x", i ? "," : "", bttv_tvcards[btv->c.type].gpiomux[i]);

	}

	printk("\n");