diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/usb/kaweth.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/usb/kaweth.c')
| -rw-r--r-- | drivers/net/usb/kaweth.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index e391ef969c28..3b80e8d2d621 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) | |||
| 471 | int result; | 471 | int result; |
| 472 | 472 | ||
| 473 | dbg("kaweth_reset(%p)", kaweth); | 473 | dbg("kaweth_reset(%p)", kaweth); |
| 474 | result = kaweth_control(kaweth, | 474 | result = usb_reset_configuration(kaweth->dev); |
| 475 | usb_sndctrlpipe(kaweth->dev, 0), | ||
| 476 | USB_REQ_SET_CONFIGURATION, | ||
| 477 | 0, | ||
| 478 | kaweth->dev->config[0].desc.bConfigurationValue, | ||
| 479 | 0, | ||
| 480 | NULL, | ||
| 481 | 0, | ||
| 482 | KAWETH_CONTROL_TIMEOUT); | ||
| 483 | |||
| 484 | mdelay(10); | 475 | mdelay(10); |
| 485 | 476 | ||
| 486 | dbg("kaweth_reset() returns %d.",result); | 477 | dbg("kaweth_reset() returns %d.",result); |