ALSA: usb-audio: scarlett2: Update get_config to do endian conversion
authorGeoffrey D. Bennett <g@b4.vu>
Tue, 22 Jun 2021 17:04:09 +0000 (02:34 +0930)
committerTakashi Iwai <tiwai@suse.de>
Tue, 22 Jun 2021 19:42:24 +0000 (21:42 +0200)
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>
sound/usb/mixer_scarlett_gen2.c

index ffa2ee8..f26ab6c 100644 (file)
@@ -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 */