summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-01-13 07:20:13 +0100
committerTakashi Iwai <tiwai@suse.de>2016-01-13 07:24:07 +0100
commitc4a359a0049f2e17b012b31e801e96566f6391e5 (patch)
tree058102d264229c91b878e795c39611de47687282
parent0a1f90a982e85f4921bed606a6b41a24f4de2ae1 (diff)
downloadlinux-stable-c4a359a0049f2e17b012b31e801e96566f6391e5.tar.gz
linux-stable-c4a359a0049f2e17b012b31e801e96566f6391e5.tar.bz2
linux-stable-c4a359a0049f2e17b012b31e801e96566f6391e5.zip
ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices
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 <owilliams@mixxx.org> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/mixer_quirks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 0ce888dceed0..279025650568 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;
}