Skip to content

Commit

Permalink
ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices
Browse files Browse the repository at this point in the history
The commit [da6d276: ALSA: usb-audio: Add resume support for
Native Instruments controls] brought a regression where the Native
Instrument audio devices don't get the correct value at update due to
the missing shift at writing.  This patch addresses it.

Fixes: da6d276 ('ALSA: usb-audio: Add resume support for Native Instruments controls')
Reported-and-tested-by: Owen Williams <[email protected]>
Cc: <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Jan 13, 2016
1 parent 0a1f90a commit c4a359a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/usb/mixer_quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol,
return 0;

kcontrol->private_value &= ~(0xff << 24);
kcontrol->private_value |= newval;
kcontrol->private_value |= (unsigned int)newval << 24;
err = snd_ni_update_cur_val(list);
return err < 0 ? err : 1;
}
Expand Down

0 comments on commit c4a359a

Please sign in to comment.