From 33ce3039dbb9ee02b5b402c0e8d21bc2cd351ade Mon Sep 17 00:00:00 2001 From: Eldad Zack Date: Mon, 29 Apr 2013 21:15:46 +0200 Subject: [PATCH] --- yaml --- r: 372063 b: refs/heads/master c: 4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e h: refs/heads/master i: 372061: 471d5d098bbdfeff5c0edac6df29c1873b86563e 372059: 6a759d2e4cab05dcb13d56c86c5a7732b2cfbdb2 372055: ee9a8e8d711b65f4984c407cee5f19393b70c4c3 372047: b65e3ed3489574d806eb898c0a9cdc0490011382 372031: 6290a07c0dfdb47849a79fcf20768fafd4a20f7b v: v3 --- [refs] | 2 +- trunk/sound/usb/caiaq/input.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 663161954251..04f6d9dde741 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 167d0a11d5feedd1f9cb9ae128ac543e97148eff +refs/heads/master: 4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e diff --git a/trunk/sound/usb/caiaq/input.c b/trunk/sound/usb/caiaq/input.c index efc70ae915c5..4b3fb91deecd 100644 --- a/trunk/sound/usb/caiaq/input.c +++ b/trunk/sound/usb/caiaq/input.c @@ -488,13 +488,13 @@ static void snd_usb_caiaq_maschine_dispatch(struct snd_usb_caiaqdev *cdev, unsigned int len) { unsigned int i, pad_id; - uint16_t pressure; + __le16 *pressure = (__le16 *) buf; for (i = 0; i < MASCHINE_PADS; i++) { - pressure = be16_to_cpu(buf[i * 2] << 8 | buf[(i * 2) + 1]); - pad_id = pressure >> 12; - - input_report_abs(cdev->input_dev, MASCHINE_PAD(pad_id), pressure & 0xfff); + pad_id = le16_to_cpu(*pressure) >> 12; + input_report_abs(cdev->input_dev, MASCHINE_PAD(pad_id), + le16_to_cpu(*pressure) & 0xfff); + pressure++; } input_sync(cdev->input_dev);