diff options
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/usbaudio.c | 10 | ||||
-rw-r--r-- | sound/usb/usbquirks.h | 23 |
2 files changed, 23 insertions, 10 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 4dfb91d4398a..b6d886373bb0 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c | |||
@@ -325,16 +325,6 @@ static int prepare_capture_urb(struct snd_usb_substream *subs, | |||
325 | } | 325 | } |
326 | urb->transfer_buffer_length = offs; | 326 | urb->transfer_buffer_length = offs; |
327 | urb->number_of_packets = ctx->packets; | 327 | urb->number_of_packets = ctx->packets; |
328 | #if 0 // for check | ||
329 | if (! urb->bandwidth) { | ||
330 | int bustime; | ||
331 | bustime = usb_check_bandwidth(urb->dev, urb); | ||
332 | if (bustime < 0) | ||
333 | return bustime; | ||
334 | printk("urb %d: bandwidth = %d (packets = %d)\n", ctx->index, bustime, urb->number_of_packets); | ||
335 | usb_claim_bandwidth(urb->dev, urb, bustime, 1); | ||
336 | } | ||
337 | #endif // for check | ||
338 | return 0; | 328 | return 0; |
339 | } | 329 | } |
340 | 330 | ||
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 25b4ab4f61e7..858262068f4f 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h | |||
@@ -948,6 +948,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
948 | }, | 948 | }, |
949 | /* TODO: add Edirol M-100FX support */ | 949 | /* TODO: add Edirol M-100FX support */ |
950 | { | 950 | { |
951 | /* has ID 0x004e when not in "Advanced Driver" mode */ | ||
952 | USB_DEVICE(0x0582, 0x004c), | ||
953 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | ||
954 | .vendor_name = "EDIROL", | ||
955 | .product_name = "PCR-A", | ||
956 | .ifnum = QUIRK_ANY_INTERFACE, | ||
957 | .type = QUIRK_COMPOSITE, | ||
958 | .data = (const struct snd_usb_audio_quirk[]) { | ||
959 | { | ||
960 | .ifnum = 1, | ||
961 | .type = QUIRK_AUDIO_STANDARD_INTERFACE | ||
962 | }, | ||
963 | { | ||
964 | .ifnum = 2, | ||
965 | .type = QUIRK_AUDIO_STANDARD_INTERFACE | ||
966 | }, | ||
967 | { | ||
968 | .ifnum = -1 | ||
969 | } | ||
970 | } | ||
971 | } | ||
972 | }, | ||
973 | { | ||
951 | /* has ID 0x004f when not in "Advanced Driver" mode */ | 974 | /* has ID 0x004f when not in "Advanced Driver" mode */ |
952 | USB_DEVICE(0x0582, 0x004d), | 975 | USB_DEVICE(0x0582, 0x004d), |
953 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | 976 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { |