From patchwork Wed May 27 15:03:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Young X-Patchwork-Id: 11573145 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A3E8166C for ; Wed, 27 May 2020 15:03:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B317207CB for ; Wed, 27 May 2020 15:03:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389447AbgE0PDz (ORCPT ); Wed, 27 May 2020 11:03:55 -0400 Received: from gofer.mess.org ([88.97.38.141]:42891 "EHLO gofer.mess.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388922AbgE0PDy (ORCPT ); Wed, 27 May 2020 11:03:54 -0400 Received: by gofer.mess.org (Postfix, from userid 1000) id E0336C63EB; Wed, 27 May 2020 16:03:52 +0100 (BST) From: Sean Young To: linux-media@vger.kernel.org, linux-usb@vger.kernel.org, Greg KH , Oliver Neukum Subject: [PATCH v3 2/3] USB: cdc-acm: blacklist IR Droid / IR Toy device Date: Wed, 27 May 2020 16:03:51 +0100 Message-Id: <20200527150352.18840-3-sean@mess.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200527150352.18840-1-sean@mess.org> References: <20200527150352.18840-1-sean@mess.org> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The IR Droid / IR Toy device used custom protocol over serial line, so it is presenting itself as CDC ACM device. Now that we have proper in-kernel driver for it we need to black-list the device in cdc-acm driver. http://dangerousprototypes.com/docs/USB_Infrared_Toy https://www.irdroid.com/irdroid-usb-ir-transceiver/ Acked-by: Greg Kroah-Hartman Signed-off-by: Sean Young --- drivers/usb/class/cdc-acm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 84d6f7df09a4..1369e3be5019 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1864,6 +1864,12 @@ static const struct usb_device_id acm_ids[] = { }, #endif +#if IS_ENABLED(CONFIG_IR_TOY) + { USB_DEVICE(0x04d8, 0xfd08), + .driver_info = IGNORE_DEVICE, + }, +#endif + /*Samsung phone in firmware update mode */ { USB_DEVICE(0x04e8, 0x685d), .driver_info = IGNORE_DEVICE,