diff options
| author | Daniel Mack <daniel@zonque.org> | 2016-08-22 09:53:36 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-08-22 12:39:42 +0300 |
| commit | 9abc134167249ded16a8c776813121609610f119 (patch) | |
| tree | a823e949ac7d66559780d1e9182ad9ec1537d9b4 | |
| parent | e12ec251e4db472e00df2aaefc13430efa25b5ea (diff) | |
| download | linux-9abc134167249ded16a8c776813121609610f119.tar.xz | |
ALSA: usb: move udh01_fb_quirk setting to quirks.c
That's a quirk, after all, so move it where to all the other quirks
live.
Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/usb/endpoint.c | 4 | ||||
| -rw-r--r-- | sound/usb/quirks.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index c07a7eda42a2..4b4ffa0adb88 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -502,10 +502,6 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip, ep->syncinterval = 3; ep->syncmaxsize = le16_to_cpu(get_endpoint(alts, 1)->wMaxPacketSize); - - if (chip->usb_id == USB_ID(0x0644, 0x8038) /* TEAC UD-H01 */ && - ep->syncmaxsize == 4) - ep->udh01_fb_quirk = 1; } list_add_tail(&ep->list, &chip->ep_list); diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 6cf1f3597455..299813f30630 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1216,6 +1216,11 @@ void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep) ep->chip->usb_id == USB_ID(0x0763, 0x2031)) && ep->type == SND_USB_ENDPOINT_TYPE_DATA) ep->skip_packets = 16; + + /* Work around devices that report unreasonable feedback data */ + if (ep->chip->usb_id == USB_ID(0x0644, 0x8038) /* TEAC UD-H01 */ && + ep->syncmaxsize == 4) + ep->udh01_fb_quirk = 1; } void snd_usb_set_interface_quirk(struct usb_device *dev) |