Skip to content

Commit

Permalink
ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_…
Browse files Browse the repository at this point in the history
…dispatch

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>
  • Loading branch information
Eldad Zack authored and Takashi Iwai committed Apr 30, 2013
1 parent 167d0a1 commit 4ca231b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions sound/usb/caiaq/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 4ca231b

Please sign in to comment.