diff options
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbmixer.c | 2 | ||||
-rw-r--r-- | sound/usb/usbquirks.h | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index 7b3bf3545a3b..325d4b6b54aa 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c | |||
@@ -360,7 +360,7 @@ static int get_ctl_value(struct usb_mixer_elem_info *cval, int request, int vali | |||
360 | request, | 360 | request, |
361 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, | 361 | USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, |
362 | validx, cval->mixer->ctrlif | (cval->id << 8), | 362 | validx, cval->mixer->ctrlif | (cval->id << 8), |
363 | buf, val_len, 100) >= 0) { | 363 | buf, val_len, 100) >= val_len) { |
364 | *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len)); | 364 | *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len)); |
365 | return 0; | 365 | return 0; |
366 | } | 366 | } |
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 8fcbe93b2589..374fbf657a2d 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h | |||
@@ -48,6 +48,15 @@ | |||
48 | USB_DEVICE_ID_MATCH_INT_CLASS | | 48 | USB_DEVICE_ID_MATCH_INT_CLASS | |
49 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | 49 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, |
50 | .idVendor = 0x046d, | 50 | .idVendor = 0x046d, |
51 | .idProduct = 0x0850, | ||
52 | .bInterfaceClass = USB_CLASS_AUDIO, | ||
53 | .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL | ||
54 | }, | ||
55 | { | ||
56 | .match_flags = USB_DEVICE_ID_MATCH_DEVICE | | ||
57 | USB_DEVICE_ID_MATCH_INT_CLASS | | ||
58 | USB_DEVICE_ID_MATCH_INT_SUBCLASS, | ||
59 | .idVendor = 0x046d, | ||
51 | .idProduct = 0x08f0, | 60 | .idProduct = 0x08f0, |
52 | .bInterfaceClass = USB_CLASS_AUDIO, | 61 | .bInterfaceClass = USB_CLASS_AUDIO, |
53 | .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL | 62 | .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL |