patch-2.4.21 linux-2.4.21/drivers/input/mousedev.c

Next file: linux-2.4.21/drivers/isdn/Config.in
Previous file: linux-2.4.21/drivers/input/keybdev.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/drivers/input/mousedev.c linux-2.4.21/drivers/input/mousedev.c
@@ -409,10 +409,13 @@
 	int minor = 0;
 
 	if (!test_bit(EV_KEY, dev->evbit) ||
-	   (!test_bit(BTN_LEFT, dev->keybit) && !test_bit(BTN_TOUCH, dev->keybit)))
+	    (!test_bit(BTN_LEFT, dev->keybit) && 
+	     !test_bit(BTN_MIDDLE, dev->keybit) && 
+	     !test_bit(BTN_TOUCH, dev->keybit)))
 		return NULL;
 
 	if ((!test_bit(EV_REL, dev->evbit) || !test_bit(REL_X, dev->relbit)) &&
+	    (!test_bit(EV_REL, dev->evbit) || !test_bit(REL_WHEEL, dev->relbit)) &&
 	    (!test_bit(EV_ABS, dev->evbit) || !test_bit(ABS_X, dev->absbit)))
 		return NULL;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)