diff options
Diffstat (limited to 'sound/usb/mixer_scarlett.c')
-rw-r--r-- | sound/usb/mixer_scarlett.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/usb/mixer_scarlett.c b/sound/usb/mixer_scarlett.c index a0a874507de5..92dba35660b3 100644 --- a/sound/usb/mixer_scarlett.c +++ b/sound/usb/mixer_scarlett.c | |||
@@ -436,10 +436,10 @@ static int scarlett_ctl_meter_get(struct snd_kcontrol *kctl, | |||
436 | struct snd_ctl_elem_value *ucontrol) | 436 | struct snd_ctl_elem_value *ucontrol) |
437 | { | 437 | { |
438 | struct usb_mixer_elem_info *elem = kctl->private_data; | 438 | struct usb_mixer_elem_info *elem = kctl->private_data; |
439 | struct snd_usb_audio *chip = elem->mixer->chip; | 439 | struct snd_usb_audio *chip = elem->head.mixer->chip; |
440 | unsigned char buf[2 * MAX_CHANNELS] = {0, }; | 440 | unsigned char buf[2 * MAX_CHANNELS] = {0, }; |
441 | int wValue = (elem->control << 8) | elem->idx_off; | 441 | int wValue = (elem->control << 8) | elem->idx_off; |
442 | int idx = snd_usb_ctrl_intf(chip) | (elem->id << 8); | 442 | int idx = snd_usb_ctrl_intf(chip) | (elem->head.id << 8); |
443 | int err; | 443 | int err; |
444 | 444 | ||
445 | err = snd_usb_ctl_msg(chip->dev, | 445 | err = snd_usb_ctl_msg(chip->dev, |
@@ -528,10 +528,10 @@ static int add_new_ctl(struct usb_mixer_interface *mixer, | |||
528 | if (!elem) | 528 | if (!elem) |
529 | return -ENOMEM; | 529 | return -ENOMEM; |
530 | 530 | ||
531 | elem->mixer = mixer; | 531 | elem->head.mixer = mixer; |
532 | elem->control = offset; | 532 | elem->control = offset; |
533 | elem->idx_off = num; | 533 | elem->idx_off = num; |
534 | elem->id = index; | 534 | elem->head.id = index; |
535 | elem->val_type = val_type; | 535 | elem->val_type = val_type; |
536 | 536 | ||
537 | elem->channels = channels; | 537 | elem->channels = channels; |