diff options
| author | Eldad Zack <eldad@fogrefinery.com> | 2013-04-29 21:15:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-30 09:19:02 +0200 |
| commit | 4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e (patch) | |
| tree | 25acf07f6210c17b7a1f930e7d136d0202094dba /sound/usb | |
| parent | 167d0a11d5feedd1f9cb9ae128ac543e97148eff (diff) | |
| download | linux-stable-4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e.tar.gz linux-stable-4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e.tar.bz2 linux-stable-4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e.zip | |
ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_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>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/caiaq/input.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c index efc70ae915c5..4b3fb91deecd 100644 --- a/sound/usb/caiaq/input.c +++ b/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); |