From fb97b55c32c152c97809b236ece474a6408b8abc Mon Sep 17 00:00:00 2001 From: Sean Young Date: Tue, 29 Jan 2013 08:19:28 -0300 Subject: [PATCH] --- yaml --- r: 357517 b: refs/heads/master c: 1e801adc7a70c2f67214b2617088a41f4bebe55e h: refs/heads/master i: 357515: c0ea03044f2d3308d15b49f5e85864b1e8e146d0 v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/ttusbir.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7ced6e5fe128..b64f713d035e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2008b56cfd6fa76ac6990d9c12a045ce5026c85 +refs/heads/master: 1e801adc7a70c2f67214b2617088a41f4bebe55e diff --git a/trunk/drivers/media/rc/ttusbir.c b/trunk/drivers/media/rc/ttusbir.c index f9226b83de41..cf0d47f57fb2 100644 --- a/trunk/drivers/media/rc/ttusbir.c +++ b/trunk/drivers/media/rc/ttusbir.c @@ -213,19 +213,20 @@ static int ttusbir_probe(struct usb_interface *intf, /* find the correct alt setting */ for (i = 0; i < intf->num_altsetting && altsetting == -1; i++) { - int bulk_out_endp = -1, iso_in_endp = -1; + int max_packet, bulk_out_endp = -1, iso_in_endp = -1; idesc = &intf->altsetting[i].desc; for (j = 0; j < idesc->bNumEndpoints; j++) { desc = &intf->altsetting[i].endpoint[j].desc; + max_packet = le16_to_cpu(desc->wMaxPacketSize); if (usb_endpoint_dir_in(desc) && usb_endpoint_xfer_isoc(desc) && - desc->wMaxPacketSize == 0x10) + max_packet == 0x10) iso_in_endp = j; else if (usb_endpoint_dir_out(desc) && usb_endpoint_xfer_bulk(desc) && - desc->wMaxPacketSize == 0x20) + max_packet == 0x20) bulk_out_endp = j; if (bulk_out_endp != -1 && iso_in_endp != -1) {