summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorGeoffrey D. Bennett <g@b4.vu>2021-06-22 20:04:09 +0300
committerTakashi Iwai <tiwai@suse.de>2021-06-22 22:42:24 +0300
commitac34df733d2dfe3b553897a1e9e1a44414f09834 (patch)
tree995a50bd19b8d56e133dded7bd43688e8cd66357 /sound/usb
parente914d8432cb4b99e8a3c42c12e912179a1cf3e73 (diff)
downloadlinux-ac34df733d2dfe3b553897a1e9e1a44414f09834.tar.xz
ALSA: usb-audio: scarlett2: Update get_config to do endian conversion
For configuration items with a size of 16, scarlett2_usb_get_config() was filling *buf with little-endian data. Update it to convert to CPU endian. This function is not currently used so affects nothing yet; will be used by the upcoming talkback feature. Signed-off-by: Geoffrey D. Bennett <g@b4.vu> Link: https://lore.kernel.org/r/cbc8b6eedd859dd27086ab4126d724a86dd50bcb.1624379707.git.g@b4.vu Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/mixer_scarlett_gen2.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
index ffa2ee8d034c..f26ab6c39859 100644
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -1170,7 +1170,13 @@ static int scarlett2_usb_get_config(
/* For byte-sized parameters, retrieve directly into buf */
if (config_item->size >= 8) {
size = config_item->size / 8 * count;
- return scarlett2_usb_get(mixer, config_item->offset, buf, size);
+ err = scarlett2_usb_get(mixer, config_item->offset, buf, size);
+ if (err < 0)
+ return err;
+ if (size == 2)
+ for (i = 0; i < count; i++, (u16 *)buf++)
+ *(u16 *)buf = le16_to_cpu(*(__le16 *)buf);
+ return 0;
}
/* For bit-sized parameters, retrieve into value */