Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206004
b: refs/heads/master
c: ab30f12
h: refs/heads/master
v: v3
  • Loading branch information
Endre Kollar authored and Greg Kroah-Hartman committed Jul 27, 2010
1 parent f96ab96 commit c4f142b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 43 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: aa5873e96271611ae55586f65e49ea1fab90cb88
refs/heads/master: ab30f12d4ef11cc92fa9a657bf0c9b9951f24011
46 changes: 4 additions & 42 deletions trunk/drivers/staging/usbip/stub_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,54 +362,16 @@ static struct stub_priv *stub_priv_alloc(struct stub_device *sdev,
return priv;
}


static struct usb_host_endpoint *get_ep_from_epnum(struct usb_device *udev,
int epnum0)
{
struct usb_host_config *config;
int i = 0, j = 0;
struct usb_host_endpoint *ep = NULL;
int epnum;
int found = 0;

if (epnum0 == 0)
return &udev->ep0;

config = udev->actconfig;
if (!config)
return NULL;

for (i = 0; i < config->desc.bNumInterfaces; i++) {
struct usb_host_interface *setting;

setting = config->interface[i]->cur_altsetting;

for (j = 0; j < setting->desc.bNumEndpoints; j++) {
ep = &setting->endpoint[j];
epnum = (ep->desc.bEndpointAddress & 0x7f);

if (epnum == epnum0) {
/* usbip_uinfo("found epnum %d\n", epnum0);*/
found = 1;
break;
}
}
}

if (found)
return ep;
else
return NULL;
}


static int get_pipe(struct stub_device *sdev, int epnum, int dir)
{
struct usb_device *udev = interface_to_usbdev(sdev->interface);
struct usb_host_endpoint *ep;
struct usb_endpoint_descriptor *epd = NULL;

ep = get_ep_from_epnum(udev, epnum);
if (dir == USBIP_DIR_IN)
ep = udev->ep_in[epnum & 0x7f];
else
ep = udev->ep_out[epnum & 0x7f];
if (!ep) {
dev_err(&sdev->interface->dev, "no such endpoint?, %d\n",
epnum);
Expand Down

0 comments on commit c4f142b

Please sign in to comment.