lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 29 Jul 2014 14:14:07 -0400 From: Benjamin Tissoires <benjamin.tissoires@...il.com> To: Przemo Firszt <przemo@...szt.eu> Cc: Benjamin Tissoires <benjamin.tissoires@...hat.com>, Dmitry Torokhov <dmitry.torokhov@...il.com>, Jiri Kosina <jkosina@...e.cz>, Ping Cheng <pinglinux@...il.com>, Jason Gerecke <killertofu@...il.com>, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, linux-input <linux-input@...r.kernel.org> Subject: Re: [PATCH 1/2] Input - Wacom: Fix transfer header problem On Sat, Jul 26, 2014 at 7:59 AM, Przemo Firszt <przemo@...szt.eu> wrote: > 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 <przemo@...szt.eu> > --- Thanks Przemo. I'll merge this one in the v3 of the wacom/BT/USB merge. I'll let you add your s-o-b line once the patches will be on the list (soonish). Cheers, Benjamin > 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; > -- > 1.9.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@...r.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists