---

yaml --- r: 372063 b: refs/heads/master c: 4ca231b h: refs/heads/master i: 372061: 471d5d0 372059: 6a759d2 372055: ee9a8e8 372047: b65e3ed 372031: 6290a07 v: v3
git-mirror · Apr 30, 2013 · 33ce303 · 33ce303
1 parent e9b9a52
commit 33ce303
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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);