From ec3ff5aeb79c5e521cd1e206dae77249eb50529a Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Wed, 27 Mar 2013 16:07:41 -0300 Subject: [PATCH] --- yaml --- r: 366883 b: refs/heads/master c: 72cc9ba39a046132a638888eaa5a14baf55621b2 h: refs/heads/master i: 366881: bd93a09593688d448300c9b44c3d8b0489f6ec3e 366879: d2ac612262d89a14e48171fecf51ddabd55e0035 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-cards.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a6d20a0cc005..3a4c90b01086 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b41869711586b047c18435ba84baf334918bae01 +refs/heads/master: 72cc9ba39a046132a638888eaa5a14baf55621b2 diff --git a/trunk/drivers/media/usb/em28xx/em28xx-cards.c b/trunk/drivers/media/usb/em28xx/em28xx-cards.c index 54e0362d8e3d..096206334134 100644 --- a/trunk/drivers/media/usb/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/usb/em28xx/em28xx-cards.c @@ -3357,14 +3357,15 @@ static int em28xx_usb_probe(struct usb_interface *interface, dev->analog_ep_bulk = e->bEndpointAddress; } else { - has_dvb = true; if (usb_endpoint_xfer_isoc(e)) { dev->dvb_ep_isoc = e->bEndpointAddress; if (size > dev->dvb_max_pkt_size_isoc) { + has_dvb = true; /* see NOTE (~) */ dev->dvb_max_pkt_size_isoc = size; dev->dvb_alt_isoc = i; } } else { + has_dvb = true; dev->dvb_ep_bulk = e->bEndpointAddress; } } @@ -3391,6 +3392,12 @@ static int em28xx_usb_probe(struct usb_interface *interface, * so far. But there might be devices for which this * logic is not sufficient... */ + /* + * NOTE (~): some manufacturers (e.g. Terratec) disable + * endpoints by setting wMaxPacketSize to 0 bytes for + * all alt settings. So far, we've seen this for + * DVB isoc endpoints only. + */ } }