summaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/byd.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-05-17 02:25:08 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-05-17 02:25:08 +0200
commit23ea5967d6bd30ed59480edbc5fe21eec81682a3 (patch)
tree345bf01823cf76596bc05e83fab9bf21678fef90 /drivers/input/mouse/byd.c
parentInput: twl6040-vibra - fix DT node memory management (diff)
parentInput: rotary-encoder - fix bare use of 'unsigned' (diff)
downloadlinux-23ea5967d6bd30ed59480edbc5fe21eec81682a3.tar.xz
linux-23ea5967d6bd30ed59480edbc5fe21eec81682a3.zip
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.7 merge window.
Diffstat (limited to 'drivers/input/mouse/byd.c')
-rw-r--r--drivers/input/mouse/byd.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mouse/byd.c b/drivers/input/mouse/byd.c
index e583f8b50454..b27aa637f877 100644
--- a/drivers/input/mouse/byd.c
+++ b/drivers/input/mouse/byd.c
@@ -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;