diff mbox

[1/3] ALSA: usb: move udh01_fb_quirk setting to quirks.c

Message ID 1471848818-11860-1-git-send-email-daniel@zonque.org (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Mack Aug. 22, 2016, 6:53 a.m. UTC 
That's a quirk, after all, so move it where to all the other quirks
live.

Signed-off-by: Daniel Mack <daniel@zonque.org>
---
 sound/usb/endpoint.c | 4 ----
 sound/usb/quirks.c   | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

Takashi Iwai Aug. 22, 2016, 9:40 a.m. UTC | #1 
On Mon, 22 Aug 2016 08:53:36 +0200,
Daniel Mack wrote:
> 
> That's a quirk, after all, so move it where to all the other quirks
> live.
> 
> Signed-off-by: Daniel Mack <daniel@zonque.org>

Thanks, applied all three patches now.


Takashi
diff mbox

Patch

diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index c07a7ed..4b4ffa0 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 6cf1f35..299813f 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)