From patchwork Wed Apr 3 22:52:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 2389471 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 250663FD8C for ; Wed, 3 Apr 2013 22:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759269Ab3DCWx7 (ORCPT ); Wed, 3 Apr 2013 18:53:59 -0400 Received: from mail-da0-f49.google.com ([209.85.210.49]:36347 "EHLO mail-da0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758489Ab3DCWx6 (ORCPT ); Wed, 3 Apr 2013 18:53:58 -0400 Received: by mail-da0-f49.google.com with SMTP id t11so849527daj.8 for ; Wed, 03 Apr 2013 15:53:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=rW0kH6XxbkeRzc69MGVdWWT93lbz6T6CdGu29mZy3hM=; b=MOKoR6m5jhDbYtfeDH2aS1mV23OWcRyQeqAPJSJoDGd4xt24+XfLlNkCzwtK3FXdHf Q4lSh/SIk36sUHMzr942MzApS64x5K1Ne30QWAHl7dxQbX6UrJror4a7Kh69D6KWzI6t D8og/X7dl/IRLuC5ce/gdFusRdX65lpvkmvlO00oCk4/Q9I828OxUO0GDiqlx+yccy6U /jqSRiLY/J3nRsQhFBAApxksrIIGW6l29tVUWsYpgHA0CjampxCqyRX43YNS6PGd3gse VmQhyzAtlLUAzlBgmSEtHowQBazVd5YqplxiERBeCLWiAclRAlWLoliZCV1Qvp7G8Gfc nXng== X-Received: by 10.68.251.169 with SMTP id zl9mr5408299pbc.17.1365029638193; Wed, 03 Apr 2013 15:53:58 -0700 (PDT) Received: from wacom-arch.wacom.com ([67.51.163.2]) by mx.google.com with ESMTPS id ij15sm8658400pac.4.2013.04.03.15.53.56 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Apr 2013 15:53:57 -0700 (PDT) From: Jason Gerecke To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, pinglinux@gmail.com, Jason Gerecke Subject: [PATCH] Input: wacom: Fix "can not retrieve extra class descriptor" for 24HDT Date: Wed, 3 Apr 2013 15:52:52 -0700 Message-Id: <1365029572-1527-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 1.8.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The MFT device in the Cintiq 24HDT has two interfaces sharing the same configuration. Without this patch, the driver attempts to make use of both interfaces, even though the second interface is not compatible with this driver. Signed-off-by: Jason Gerecke --- drivers/input/tablet/wacom_wac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 1daa979..ed78be9 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -2209,7 +2209,7 @@ const struct usb_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x47) }, { USB_DEVICE_WACOM(0xF4) }, { USB_DEVICE_WACOM(0xF8) }, - { USB_DEVICE_WACOM(0xF6) }, + { USB_DEVICE_DETAILED(0xF6, USB_CLASS_HID, 0, 0) }, { USB_DEVICE_WACOM(0xFA) }, { USB_DEVICE_LENOVO(0x6004) }, { }