ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch
authorEldad Zack <eldad@fogrefinery.com>
Mon, 29 Apr 2013 19:15:46 +0000 (21:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 30 Apr 2013 07:19:02 +0000 (09:19 +0200)
Current code does this:

  be16_to_cpu(buf[i * 2] << 8 | buf[(i * 2) + 1])

Which is effectively (neglecting the index):

  be16_to_cpu(be16_to_cpu(*((u16 *) buf)))

This means the int16 in the buffer is not converted at all.

Daniel Mack confirmed that the driver works on little endian
CPUs, leading to the conclusion that the device-side structure
is actually little endian.
This changes the code to use le16_to_cpu().

Caught by sparse.

Acked-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/caiaq/input.c

index efc70ae915c5eff215e56f89d96e4bb32f7c09c1..4b3fb91deecdf3b0d9e6048ff34d7646649827b6 100644 (file)
@@ -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);