diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-04 02:42:21 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-10-04 02:42:21 +0300 |
commit | c758f96a8c346ac5a6822b521ec92308c5774381 (patch) | |
tree | 377b72d74ee58b3e1eeb0528d0618e38645aaafc /drivers/input/mouse/psmouse-base.c | |
parent | 9fb6de1b0bf4ec11573b76059da3c3b39ac7f2ff (diff) | |
parent | 265d426d7470d53e900379960eef5b4482125089 (diff) | |
download | linux-c758f96a8c346ac5a6822b521ec92308c5774381.tar.xz |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.9 merge window.
Diffstat (limited to 'drivers/input/mouse/psmouse-base.c')
-rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 5784e20542a4..fb4b185dea96 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -1916,7 +1916,7 @@ static int __init psmouse_init(void) synaptics_module_init(); hgpk_module_init(); - kpsmoused_wq = create_singlethread_workqueue("kpsmoused"); + kpsmoused_wq = alloc_ordered_workqueue("kpsmoused", 0); if (!kpsmoused_wq) { pr_err("failed to create kpsmoused workqueue\n"); return -ENOMEM; |