summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2009-10-29 05:07:12 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-29 23:06:39 -0700
commitf0816ce39d8de7646301aac52cc7351a2424d97f (patch)
tree3bd98c6495654e6b33c676fd6c9c56bef3818570 /drivers/net/usb
parent43ab85021e8286e1641928ab3cc542dd1e8c7f94 (diff)
downloadop-kernel-dev-f0816ce39d8de7646301aac52cc7351a2424d97f.zip
op-kernel-dev-f0816ce39d8de7646301aac52cc7351a2424d97f.tar.gz
convert kaweth to use usb_reset_configuration()
For USB 3.0 it is necessary that all drivers use the standard API to reset a configuration. This removes a home-grown implementation. Signed-off-by: Oliver Neukum <oliver@neukum.org> Hi David, please take this for the next merge window. Regards Oliver Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/kaweth.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index e391ef9..3b80e8d 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -471,16 +471,7 @@ static int kaweth_reset(struct kaweth_device *kaweth)
int result;
dbg("kaweth_reset(%p)", kaweth);
- result = kaweth_control(kaweth,
- usb_sndctrlpipe(kaweth->dev, 0),
- USB_REQ_SET_CONFIGURATION,
- 0,
- kaweth->dev->config[0].desc.bConfigurationValue,
- 0,
- NULL,
- 0,
- KAWETH_CONTROL_TIMEOUT);
-
+ result = usb_reset_configuration(kaweth->dev);
mdelay(10);
dbg("kaweth_reset() returns %d.",result);
OpenPOWER on IntegriCloud