Skip to content

Commit e721701

Browse files
committed
ALSA: usb: fcp: Fix meter_levels type to __le32
The cached level meter values are returned from the USB core as __le32, hence declare properly. Fixes: 46757a3 ("ALSA: FCP: Add Focusrite Control Protocol driver") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 711aad3 commit e721701

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sound/usb/fcp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct fcp_data {
100100

101101
u8 num_meter_slots;
102102
s16 *meter_level_map;
103-
u32 *meter_levels;
103+
__le32 *meter_levels;
104104
struct snd_kcontrol *meter_ctl;
105105

106106
unsigned int *meter_labels_tlv;
@@ -383,7 +383,7 @@ static int fcp_meter_ctl_get(struct snd_kcontrol *kctl,
383383
struct usb_mixer_interface *mixer = elem->head.mixer;
384384
struct fcp_data *private = mixer->private_data;
385385
int num_meter_slots, resp_size;
386-
u32 *resp = private->meter_levels;
386+
__le32 *resp = private->meter_levels;
387387
int i, err = 0;
388388

389389
struct {
@@ -655,15 +655,15 @@ static int fcp_ioctl_set_meter_map(struct usb_mixer_interface *mixer,
655655
/* If the control doesn't exist, create it */
656656
if (!private->meter_ctl) {
657657
s16 *new_map __free(kfree) = NULL;
658-
u32 *meter_levels __free(kfree) = NULL;
658+
__le32 *meter_levels __free(kfree) = NULL;
659659

660660
/* Allocate buffer for the map */
661661
new_map = kmalloc_array(map.map_size, sizeof(s16), GFP_KERNEL);
662662
if (!new_map)
663663
return -ENOMEM;
664664

665665
/* Allocate buffer for reading meter levels */
666-
meter_levels = kmalloc_array(map.meter_slots, sizeof(u32),
666+
meter_levels = kmalloc_array(map.meter_slots, sizeof(__le32),
667667
GFP_KERNEL);
668668
if (!meter_levels)
669669
return -ENOMEM;

0 commit comments

Comments
 (0)