From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63320C43387 for ; Fri, 11 Jan 2019 14:25:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29C2C20874 for ; Fri, 11 Jan 2019 14:25:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216705; bh=NaFWnKnDkrv9YL6tdAaT2kI+jegMBSQPkxVv3rtQeOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MCOo9AhU69z2rrL1j0JMyjYha+gboV9YjsBLoe3LO0h9WTUQi+/vydAWpRmok2qmE +dTaszk4p2+JFLeYuCkKr6nXxsFNrp3y6E79aHuYpTfKG+IyEf5UpyYY/vA9DrcEoq 9F9Xd0mqTzGioYv4Ah2mIU8DEXqPjfRrXEyuXKcE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387988AbfAKOSn (ORCPT ); Fri, 11 Jan 2019 09:18:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:35224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387986AbfAKOSn (ORCPT ); Fri, 11 Jan 2019 09:18:43 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0C95B2183F; Fri, 11 Jan 2019 14:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547216322; bh=NaFWnKnDkrv9YL6tdAaT2kI+jegMBSQPkxVv3rtQeOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AxPgSS53jFoUf7K9ahT3DUGslXPw1DIbhpO0yzuIscW9np1YEERG3SsbZ4Uiy26+O jHz7hOLzssUmN22Vf29LuudOEEbHeSbDADjs5tVpjDkwch5lpgKoEnvsRe6GOLa9rh RkL1Do+BrnJx2DTsuv/mzMXuExnfdjZzLCdzD8oY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Hutterer , Martin Kepplinger , Benjamin Tissoires , Dmitry Torokhov , Sasha Levin Subject: [PATCH 4.4 58/88] Input: restore EV_ABS ABS_RESERVED Date: Fri, 11 Jan 2019 15:08:27 +0100 Message-Id: <20190111131054.880309817@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190111131045.137499039@linuxfoundation.org> References: <20190111131045.137499039@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c201e3808e0e4be9b98d192802085a9f491bd80c ] ABS_RESERVED was added in d9ca1c990a7 and accidentally removed as part of ffe0e7cf290f5c9 when the high-resolution scrolling code was removed. Signed-off-by: Peter Hutterer Reviewed-by: Martin Kepplinger Acked-by: Benjamin Tissoires Acked-by: Dmitry Torokhov Signed-off-by: Benjamin Tissoires Signed-off-by: Sasha Levin --- include/uapi/linux/input-event-codes.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 87cf351bab03..9e07bf4259e1 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -708,6 +708,15 @@ #define ABS_MISC 0x28 +/* + * 0x2e is reserved and should not be used in input drivers. + * It was used by HID as ABS_MISC+6 and userspace needs to detect if + * the next ABS_* event is correct or is just ABS_MISC + n. + * We define here ABS_RESERVED so userspace can rely on it and detect + * the situation described above. + */ +#define ABS_RESERVED 0x2e + #define ABS_MT_SLOT 0x2f /* MT slot being modified */ #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ -- 2.19.1