| From c4a359a0049f2e17b012b31e801e96566f6391e5 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Wed, 13 Jan 2016 07:20:13 +0100 |
| Subject: ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| 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 <owilliams@mixxx.org> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/usb/mixer_quirks.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/sound/usb/mixer_quirks.c |
| +++ b/sound/usb/mixer_quirks.c |
| @@ -793,7 +793,7 @@ static int snd_nativeinstruments_control |
| 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; |
| } |
