diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 20:02:56 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 20:02:56 +0200 |
| commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch) | |
| tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 /drivers/input/input.c | |
| parent | Input: pixcir_ts - add support for axis inversion / swapping (diff) | |
| parent | Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle (diff) | |
| download | linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.xz linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.zip | |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index fbe4fe8d7550..d95c34ee5dc1 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -1014,7 +1014,7 @@ static int input_bits_to_string(char *buf, int buf_size, { int len = 0; - if (INPUT_COMPAT_TEST) { + if (in_compat_syscall()) { u32 dword = bits >> 32; if (dword || !skip_empty) len += snprintf(buf, buf_size, "%x ", dword); |