summaryrefslogtreecommitdiff
path: root/drivers/input/input.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-07-19 11:02:56 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-07-19 11:02:56 -0700
commit8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch)
tree8ef0f3c986968392ccdc70ca43b23eba729e2019 /drivers/input/input.c
parent0bb11e969f5367dcb661f9fcc77efd5d58a2c470 (diff)
parent6a5029e66404462a3322dba8e35615bd09332081 (diff)
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.c2
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);