Merge branch 'next' into for-linus
Prepare first round of input updates for 4.7 merge window.
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user