From: Takashi Iwai Date: Wed, 13 Jan 2016 06:20:13 +0000 (+0100) Subject: ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices X-Git-Tag: v4.4.1~53 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bae71eb004d0272b6552e45fdff7e58233da27bd;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices commit c4a359a0049f2e17b012b31e801e96566f6391e5 upstream. The commit [da6d276957ea: 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: da6d276957ea ('ALSA: usb-audio: Add resume support for Native Instruments controls') Reported-and-tested-by: Owen Williams Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 0ce888d..2790256 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -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; }