From patchwork Sat Jul 26 11:59:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UHJ6ZW15c8OF4oCaYXcgRmlyc3p0?= X-Patchwork-Id: 4626811 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A4CC6C0338 for ; Sat, 26 Jul 2014 12:00:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E46D9201D3 for ; Sat, 26 Jul 2014 12:00:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDB5B201CD for ; Sat, 26 Jul 2014 12:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750995AbaGZL77 (ORCPT ); Sat, 26 Jul 2014 07:59:59 -0400 Received: from si-002-i47.relay.mailchannels.net ([184.154.112.221]:43843 "EHLO relay.mailchannels.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750732AbaGZL76 (ORCPT ); Sat, 26 Jul 2014 07:59:58 -0400 X-Sender-Id: arvixe|x-authuser|przemo@firszt.eu Received: from wren.arvixe.com (ip-10-218-133-212.us-west-2.compute.internal [10.218.133.212]) by relay.mailchannels.net (Postfix) with ESMTPA id CA09E100173; Sat, 26 Jul 2014 11:59:52 +0000 (UTC) X-Sender-Id: arvixe|x-authuser|przemo@firszt.eu Received: from wren.arvixe.com (wren.arvixe.com [10.245.145.206]) (using TLSv1 with cipher DHE-RSA-AES256-SHA) by 0.0.0.0:2500 (trex/5.2.12); Sat, 26 Jul 2014 11:59:56 GMT X-MC-Relay: Good X-MailChannels-SenderId: arvixe|x-authuser|przemo@firszt.eu X-MailChannels-Auth-Id: arvixe Received: from [79.97.111.186] (port=55070 helo=localhost.localdomain) by wren.arvixe.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.82) (envelope-from ) id 1XB0di-0005ZR-9G; Sat, 26 Jul 2014 04:59:50 -0700 From: Przemo Firszt To: benjamin.tissoires@redhat.com Cc: dmitry.torokhov@gmail.com, jkosina@suse.cz, pinglinux@gmail.com, killertofu@gmail.com, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, Przemo Firszt Subject: [PATCH 1/2] Input - Wacom: Fix transfer header problem Date: Sat, 26 Jul 2014 12:59:28 +0100 Message-Id: <1406375969-4453-1-git-send-email-przemo@firszt.eu> X-Mailer: git-send-email 1.9.3 X-AuthUser: przemo@firszt.eu Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Header of transfer of image is different depending on connection type. That patch should be probably merged with 462c52a8cbcc62c Input - wacom: Check for bluetooth protocol while setting OLEDs Signed-off-by: Przemo Firszt --- drivers/hid/wacom_sys.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 42f139f..51437e2 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -19,6 +19,7 @@ #define WAC_CMD_LED_CONTROL 0x20 #define WAC_CMD_ICON_START 0x21 +#define WAC_CMD_ICON_BT_XFER 0x26 #define WAC_CMD_ICON_XFER 0x23 #define WAC_CMD_RETRIES 10 @@ -550,7 +551,7 @@ static int wacom_led_putimage(struct wacom *wacom, int button_id, if (retval < 0) goto out; - buf[0] = WAC_CMD_ICON_XFER; + buf[0] = len == 256 ? WAC_CMD_ICON_BT_XFER : WAC_CMD_ICON_XFER; buf[1] = button_id & 0x07; for (i = 0; i < 4; i++) { buf[2] = i;