patch-2.4.0-test11 linux/drivers/char/joystick/adi.c

• Lines: 18
• Date: Fri Nov 17 16:52:23 2000
• Orig file: v2.4.0-test10/linux/drivers/char/joystick/adi.c
• Orig date: Thu Jun 22 06:59:58 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/char/joystick/adi.c linux/drivers/char/joystick/adi.c
@@ -418,7 +418,7 @@
 	adi->dev.private = port;
 	adi->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
 
-	for (i = 0; i < adi->axes10 + adi->axes8 + adi->hats * 2; i++)
+	for (i = 0; i < adi->axes10 + adi->axes8 + (adi->hats + (adi->pad > 0)) * 2; i++)
 		set_bit(adi->abs[i], &adi->dev.absbit);
 
 	for (i = 0; i < adi->buttons; i++)
@@ -431,7 +431,7 @@
 
 	if (!adi->length) return;
 
-	for (i = 0; i < adi->axes10 + adi->axes8 + adi->hats * 2; i++) {
+	for (i = 0; i < adi->axes10 + adi->axes8 + (adi->hats + (adi->pad > 0)) * 2; i++) {
 
 		t = adi->abs[i];
 		x = adi->dev.abs[t];