From 61486adbe10c7a8ed4ed92ff5c79b72f6fdc1b8d Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Wed, 24 Oct 2012 19:47:01 +0000 Subject: [PATCH] --- yaml --- r: 340487 b: refs/heads/master c: 7cdd248799070ed212e830037904687072bedef1 h: refs/heads/master i: 340485: 10fd8b9c49b34645766ea89be807efb84ce94ace 340483: c90a05d4d2ac4de7a1c38647d8003462c00eef40 340479: 95482354bc39224f918430dc6275cf4b7bd3df58 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/plusb.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 277944e44de2..8c3961da2ce5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ffbe4daa8104145cca4050d717d68b0b256df45 +refs/heads/master: 7cdd248799070ed212e830037904687072bedef1 diff --git a/trunk/drivers/net/usb/plusb.c b/trunk/drivers/net/usb/plusb.c index 4584b9a805b3..0fcc8e65a068 100644 --- a/trunk/drivers/net/usb/plusb.c +++ b/trunk/drivers/net/usb/plusb.c @@ -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