Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340487
b: refs/heads/master
c: 7cdd248
h: refs/heads/master
i:
  340485: 10fd8b9
  340483: c90a05d
  340479: 9548235
v: v3
  • Loading branch information
Ming Lei authored and David S. Miller committed Oct 26, 2012
1 parent 1f56d6c commit 61486ad
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 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: 5ffbe4daa8104145cca4050d717d68b0b256df45
refs/heads/master: 7cdd248799070ed212e830037904687072bedef1
11 changes: 4 additions & 7 deletions trunk/drivers/net/usb/plusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,10 @@
static inline int
pl_vendor_req(struct usbnet *dev, u8 req, u8 val, u8 index)
{
return usb_control_msg(dev->udev,
usb_rcvctrlpipe(dev->udev, 0),
req,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
val, index,
NULL, 0,
USB_CTRL_GET_TIMEOUT);
return usbnet_read_cmd(dev, req,
USB_DIR_IN | USB_TYPE_VENDOR |
USB_RECIP_DEVICE,
val, index, NULL, 0);
}

static inline int
Expand Down

0 comments on commit 61486ad

Please sign in to comment.