diff --git a/drivers/input/input.c b/drivers/input/input.c
index 5f6404d9e24f123b7ee24b261ebaef361dfbb2d6..cf6f557428c0d4e7cf12d8d7478b9b1c7cd8a1ce 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -2182,12 +2182,6 @@ int input_register_device(struct input_dev *dev)
 	/* KEY_RESERVED is not supposed to be transmitted to userspace. */
 	__clear_bit(KEY_RESERVED, dev->keybit);
 
-	/* Buttonpads should not map BTN_RIGHT and/or BTN_MIDDLE. */
-	if (test_bit(INPUT_PROP_BUTTONPAD, dev->propbit)) {
-		__clear_bit(BTN_RIGHT, dev->keybit);
-		__clear_bit(BTN_MIDDLE, dev->keybit);
-	}
-
 	/* Make sure that bitmasks not mentioned in dev->evbit are clean. */
 	input_cleanse_bitmasks(dev);