From patchwork Sat Sep 1 22:52:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Cantin X-Patchwork-Id: 1395941 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7817CDFFF1 for ; Sat, 1 Sep 2012 22:51:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755811Ab2IAWuP (ORCPT ); Sat, 1 Sep 2012 18:50:15 -0400 Received: from smtp05.smtpout.orange.fr ([80.12.242.127]:45360 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755783Ab2IAWuM (ORCPT ); Sat, 1 Sep 2012 18:50:12 -0400 Received: from nestor.ysoft.org ([83.193.185.73]) by mwinf5d62 with ME id tyq91j00K1bSSDf03yq9El; Sun, 02 Sep 2012 00:50:10 +0200 Received: from localhost.ysoft.org (coyote.ysoft.org [192.168.1.100]) by nestor.ysoft.org (Postfix) with ESMTP id 7C0A221C7F; Sun, 2 Sep 2012 00:50:09 +0200 (CEST) From: Yann Cantin To: linux-input@vger.kernel.org, linux-usb@vger.kernel.org Cc: gregkh@linuxfoundation.org, dmitry.torokhov@gmail.com, linux-kernel@vger.kernel.org, Yann Cantin Subject: [eBeam PATCH 1/2] hid: Blacklist eBeam devices Date: Sun, 2 Sep 2012 00:52:02 +0200 Message-Id: <1346539923-9704-2-git-send-email-yann.cantin@laposte.net> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1346539923-9704-1-git-send-email-yann.cantin@laposte.net> References: <1346539923-9704-1-git-send-email-yann.cantin@laposte.net> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Signed-off-by: Yann Cantin --- drivers/hid/hid-core.c | 3 +++ drivers/hid/hid-ids.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 8bf8a64..b4b0baf 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1907,6 +1907,9 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) }, { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) }, +#if defined(CONFIG_INPUT_EBEAM_USB) + { HID_USB_DEVICE(USB_VENDOR_ID_EFI, USB_DEVICE_ID_EFI_EBEAM) }, +#endif { HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) }, { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC5UH) }, { HID_USB_DEVICE(USB_VENDOR_ID_ETT, USB_DEVICE_ID_TC4UM) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 1dcb76f..93f5b83 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -271,6 +271,9 @@ #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349 0x7349 #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001 0xa001 +#define USB_VENDOR_ID_EFI 0x2650 +#define USB_DEVICE_ID_EFI_EBEAM 0x1311 + #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061