diff options
| -rw-r--r-- | drivers/input/mouse/alps.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index a4d69ef0f846..b4144ad0987b 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
| @@ -117,7 +117,14 @@ static const struct alps_model_info alps_model_data[] = { | |||
| 117 | { { 0x73, 0x00, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_DUALPOINT } }, /* ThinkPad R61 8918-5QG */ | 117 | { { 0x73, 0x00, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_DUALPOINT } }, /* ThinkPad R61 8918-5QG */ |
| 118 | { { 0x73, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } }, | 118 | { { 0x73, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } }, |
| 119 | { { 0x73, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 } }, /* Ahtec Laptop */ | 119 | { { 0x73, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_FW_BK_2 } }, /* Ahtec Laptop */ |
| 120 | { { 0x20, 0x02, 0x0e }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT } }, /* XXX */ | 120 | |
| 121 | /* | ||
| 122 | * XXX This entry is suspicious. First byte has zero lower nibble, | ||
| 123 | * which is what a normal mouse would report. Also, the value 0x0e | ||
| 124 | * isn't valid per PS/2 spec. | ||
| 125 | */ | ||
| 126 | { { 0x20, 0x02, 0x0e }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT } }, | ||
| 127 | |||
| 121 | { { 0x22, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT } }, | 128 | { { 0x22, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT } }, |
| 122 | { { 0x22, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT } }, /* Dell Latitude D600 */ | 129 | { { 0x22, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT } }, /* Dell Latitude D600 */ |
| 123 | /* Dell Latitude E5500, E6400, E6500, Precision M4400 */ | 130 | /* Dell Latitude E5500, E6400, E6500, Precision M4400 */ |
| @@ -151,12 +158,6 @@ static void alps_set_abs_params_st(struct alps_data *priv, | |||
| 151 | static void alps_set_abs_params_mt(struct alps_data *priv, | 158 | static void alps_set_abs_params_mt(struct alps_data *priv, |
| 152 | struct input_dev *dev1); | 159 | struct input_dev *dev1); |
| 153 | 160 | ||
| 154 | /* | ||
| 155 | * XXX - this entry is suspicious. First byte has zero lower nibble, | ||
| 156 | * which is what a normal mouse would report. Also, the value 0x0e | ||
| 157 | * isn't valid per PS/2 spec. | ||
| 158 | */ | ||
| 159 | |||
| 160 | /* Packet formats are described in Documentation/input/alps.txt */ | 161 | /* Packet formats are described in Documentation/input/alps.txt */ |
| 161 | 162 | ||
| 162 | static bool alps_is_valid_first_byte(struct alps_data *priv, | 163 | static bool alps_is_valid_first_byte(struct alps_data *priv, |
