Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 357517
b: refs/heads/master
c: 1e801ad
h: refs/heads/master
i:
  357515: c0ea030
v: v3
  • Loading branch information
Sean Young authored and Mauro Carvalho Chehab committed Feb 8, 2013
1 parent cb30eee commit fb97b55
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2008b56cfd6fa76ac6990d9c12a045ce5026c85
refs/heads/master: 1e801adc7a70c2f67214b2617088a41f4bebe55e
7 changes: 4 additions & 3 deletions trunk/drivers/media/rc/ttusbir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit fb97b55

Please sign in to comment.