diff options
author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2013-04-08 12:06:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-25 08:51:23 -0400 |
commit | b3404a8ef567de43b74018bbdbd989b53426d422 (patch) | |
tree | fa2633e81026c5e4a2f8f664eb2ce107e0cef481 /drivers/media/usb/em28xx/em28xx-cards.c | |
parent | cb132cd5d75f6cd3295c2c041177eeb89f778db8 (diff) |
[media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
X-Patchwork-Delegate: mchehab@redhat.com
In addition to commit 72cc9ba3 "em28xx: ignore isoc DVB USB endpoints with
wMaxPacketSize = 0 bytes for all alt settings" we should not save the endpoint
number of the isoc DVB endpoint before it has been validated.
While the current code works fine, dev->dvb_ep_isoc != 0 could be interpreted
as indicator that the device provides DVB support.
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index d2ed67825993..83bfbe4c980f 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c | |||
@@ -3220,9 +3220,9 @@ static int em28xx_usb_probe(struct usb_interface *interface, | |||
3220 | e->bEndpointAddress; | 3220 | e->bEndpointAddress; |
3221 | } else { | 3221 | } else { |
3222 | if (usb_endpoint_xfer_isoc(e)) { | 3222 | if (usb_endpoint_xfer_isoc(e)) { |
3223 | dev->dvb_ep_isoc = e->bEndpointAddress; | ||
3224 | if (size > dev->dvb_max_pkt_size_isoc) { | 3223 | if (size > dev->dvb_max_pkt_size_isoc) { |
3225 | has_dvb = true; /* see NOTE (~) */ | 3224 | has_dvb = true; /* see NOTE (~) */ |
3225 | dev->dvb_ep_isoc = e->bEndpointAddress; | ||
3226 | dev->dvb_max_pkt_size_isoc = size; | 3226 | dev->dvb_max_pkt_size_isoc = size; |
3227 | dev->dvb_alt_isoc = i; | 3227 | dev->dvb_alt_isoc = i; |
3228 | } | 3228 | } |