Merge branch 'next' into for-linus

Prepare first round of input updates for 4.7 merge window.
This commit is contained in:
Dmitry Torokhov
2016-05-16 17:25:08 -07:00
15 changed files with 170 additions and 182 deletions

View File

@@ -478,7 +478,6 @@ int byd_init(struct psmouse *psmouse)
if (!priv)
return -ENOMEM;
memset(priv, 0, sizeof(*priv));
setup_timer(&priv->timer, byd_clear_touch, (unsigned long) psmouse);
psmouse->private = priv;