From patchwork Wed Mar 29 18:41:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Armstrong Skomra X-Patchwork-Id: 9652279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ECA5760113 for ; Wed, 29 Mar 2017 18:43:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD81F28524 for ; Wed, 29 Mar 2017 18:43:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D22D628527; Wed, 29 Mar 2017 18:43:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF31728524 for ; Wed, 29 Mar 2017 18:43:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932204AbdC2SnQ (ORCPT ); Wed, 29 Mar 2017 14:43:16 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:32973 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932201AbdC2SnP (ORCPT ); Wed, 29 Mar 2017 14:43:15 -0400 Received: by mail-pg0-f66.google.com with SMTP id 79so3905163pgf.0 for ; Wed, 29 Mar 2017 11:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=C9Qo29niwYOqTk+gGll/QYFbNwHjjAfW/X/srYCopcQ=; b=I/dYaeeYkCbAmc6QshosvxVYRthSQ4FrEVGu6DLdj4SmWJpHMWxrnTOe3WKbs2rjas hv1N7ohHXNi16um7pCuU/PQT0J1MqTr6MLfgz/4dCbp9ngZu0eiQf65Uq2ysIoWibpqZ 9DS7cvI2fx5wDA8rqFeyXGiWkhvJVXdjoDKRpOdPdRQedUuQTpkhR/+vQyj2jDeE8y+F RO9FBjzvc5oIeG9UtwJN7HoukcKKaj4NHmfoqGuRyM3Wm6TYZ/jm/N4MLuj4i2J4KzF5 p8WL5xLXt1kRPvJW/A4CdbVqHCH3YZLDwG3+ueywd+fDm25ztHaXZ6hmu8r09DtqxjzS LLeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=C9Qo29niwYOqTk+gGll/QYFbNwHjjAfW/X/srYCopcQ=; b=f3oDlN1RWVDNZawR4+oqNNe0F+tS5IJfJadu1UkGIA7MIayYjkh4OelPtDBQLDJGfS OpUQY1zuvYzQBw45wdC7FW9HcNaRLSyTHTwDxvh/hcKHnU2hWwQCMUdz3o0DUEyir11f q3oX8LKhz1N4U8wJGH4QwhHXToU8gndEBKbp8w5eKTSZFyo26SBvPAov3ykwXvG+fiLH FPLQNNL6MX7WkSWql6azHv10uDYN1z6Mfq6fMYOL5ewCaFSLf1RU7MbmT83dWwY8M0G0 AKMeKDcgfpi1IYA5Bc+9NmoZePOmxRAiJoBqoYuBxFo2wDtwZJV91VctQbsKNlsmqDnp rJxg== X-Gm-Message-State: AFeK/H3z0Jbz/TNvOR93g7r0pqzmCc3A7LzMTSx0cEBTzaAJmcs5wGrIK8t8sWYWejYUyg== X-Received: by 10.84.210.228 with SMTP id a91mr2234979pli.120.1490812994466; Wed, 29 Mar 2017 11:43:14 -0700 (PDT) Received: from localhost.localdomain (75-164-129-33.ptld.qwest.net. [75.164.129.33]) by smtp.googlemail.com with ESMTPSA id e5sm14950691pga.13.2017.03.29.11.43.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Mar 2017 11:43:13 -0700 (PDT) From: Aaron Armstrong Skomra To: linux-input@vger.kernel.org, jkosina@suse.cz, pinglinux@gmail.com, killertofu@gmail.com, benjamin.tissoires@redhat.com Cc: Aaron Armstrong Skomra , Aaron Armstrong Skomra Subject: [PATCH] HID: wacom: call _query_tablet_data() for BAMBOO_TOUCH Date: Wed, 29 Mar 2017 11:41:28 -0700 Message-Id: <1490812888-31078-1-git-send-email-skomra@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit a544c619a54b ("HID: wacom: do not attempt to switch mode while in probe") introduces delayed work for querying (setting the mode) on all tablets. Bamboo Touch (056a:00d0) has a ghost interface which claims to be a pen device. Though this device can be removed, we have to set the mode on the ghost pen interface before we remove it. After the aforementioned delay was introduced the device was being removed before the mode setting could be executed. Signed-off-by: Aaron Armstrong Skomra --- This is a fix for 4.11 drivers/hid/wacom_sys.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 0bcfb2026223..98bc9c90d5f8 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -2216,6 +2216,8 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) /* touch only Bamboo doesn't support pen */ if ((features->type == BAMBOO_TOUCH) && (features->device_type & WACOM_DEVICETYPE_PEN)) { + cancel_delayed_work_sync(&wacom->init_work); + _wacom_query_tablet_data(wacom); error = -ENODEV; goto fail_quirks; }