diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
| commit | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch) | |
| tree | beba3ecc27c64e0c22b1a21201f1999afe9834f2 /sound/usb | |
| parent | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff) | |
| parent | b2cd64153b94473f6bd82448a68b8e8c041676ea (diff) | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
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 7b3bf3545a3..325d4b6b54a 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 request, USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN, validx, cval->mixer->ctrlif | (cval->id << 8), - buf, val_len, 100) >= 0) { + buf, val_len, 100) >= val_len) { *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len)); return 0; } diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 8fcbe93b258..374fbf657a2 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h @@ -48,6 +48,15 @@ USB_DEVICE_ID_MATCH_INT_CLASS | USB_DEVICE_ID_MATCH_INT_SUBCLASS, .idVendor = 0x046d, + .idProduct = 0x0850, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL +}, +{ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, .idProduct = 0x08f0, .bInterfaceClass = USB_CLASS_AUDIO, .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL |