diff options
| -rw-r--r-- | drivers/input/mouse/alps.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index e32625ccf8b6..27bcdbc950c9 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
| @@ -1161,7 +1161,12 @@ static void alps_report_bare_ps2_packet(struct psmouse *psmouse, | |||
| 1161 | struct alps_data *priv = psmouse->private; | 1161 | struct alps_data *priv = psmouse->private; |
| 1162 | struct input_dev *dev; | 1162 | struct input_dev *dev; |
| 1163 | 1163 | ||
| 1164 | if (unlikely(IS_ERR_OR_NULL(priv->dev3))) { | 1164 | /* Figure out which device to use to report the bare packet */ |
| 1165 | if (priv->proto_version == ALPS_PROTO_V2 && | ||
| 1166 | (priv->flags & ALPS_DUALPOINT)) { | ||
| 1167 | /* On V2 devices the DualPoint Stick reports bare packets */ | ||
| 1168 | dev = priv->dev2; | ||
| 1169 | } else if (unlikely(IS_ERR_OR_NULL(priv->dev3))) { | ||
| 1165 | /* Register dev3 mouse if we received PS/2 packet first time */ | 1170 | /* Register dev3 mouse if we received PS/2 packet first time */ |
| 1166 | if (!IS_ERR(priv->dev3)) | 1171 | if (!IS_ERR(priv->dev3)) |
| 1167 | psmouse_queue_work(psmouse, &priv->dev3_register_work, | 1172 | psmouse_queue_work(psmouse, &priv->dev3_register_work, |
