[media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings...
authorFrank Schaefer <fschaefer.oss@googlemail.com>
Mon, 8 Apr 2013 16:06:59 +0000 (13:06 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 25 Apr 2013 12:51:23 +0000 (09:51 -0300)
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>
drivers/media/usb/em28xx/em28xx-cards.c

index d2ed67825993b9a958a36f14411cbe8f2e1a7713..83bfbe4c980fdad90b23b952f739f038ef12bc3f 100644 (file)
@@ -3220,9 +3220,9 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                                                            e->bEndpointAddress;
                                        } else {
                                                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_ep_isoc = e->bEndpointAddress;
                                                                dev->dvb_max_pkt_size_isoc = size;
                                                                dev->dvb_alt_isoc = i;
                                                        }