diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-23 05:56:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-23 05:56:56 -0700 |
| commit | 2e04fffa4a581c17f9e4ca538026331defda23a6 (patch) | |
| tree | 0c3f477031a98335b5dcc87ab6676aac5fe413e7 | |
| parent | a2aa60c24e69e387c056656e4b01be598a96e506 (diff) | |
| parent | 04282fcc795edab73cffb4a1c63459657815bd9d (diff) | |
Merge "sound: usb: Add quirk to issue SET_CUR volume on 2nd channel"
| -rw-r--r-- | sound/usb/mixer.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 70dfdd22102e..d5cc315a5eb4 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1012,6 +1012,17 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval, cval->res = 384; } break; + + case USB_ID(0x1130, 0x1620): /* Logitech Speakers S150 */ + /* This audio device has 2 channels and it explicitly requires the + * host to send SET_CUR command on the volume control of both the + * channels. 7936 = 0x1F00 is the default value. + */ + if (cval->channels == 2) + snd_usb_mixer_set_ctl_value(cval, UAC_SET_CUR, + (cval->control << 8) | 2, 7936); + break; + } } |