diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-06 11:10:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-06 11:10:21 +0300 |
| commit | f87c8e80545fd277f69521ef859c3e71c6af5656 (patch) | |
| tree | ef5e7274559ec6fcdc9b758411a9c7a07cab0711 /drivers/usb/net/asix.c | |
| parent | 91f7b5c41811154706448b2bf500000cbbfa96ba (diff) | |
| parent | 14e51f28ade783cd948cd10202a696ff7e5d33d6 (diff) | |
| download | linux-f87c8e80545fd277f69521ef859c3e71c6af5656.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: asix: Fix AX88772 device PHY selection
USB: usblp.c - add Kyocera Mita FS 820 to list of "quirky" printers
sisusb_con warning fixes
USB: Fixed bug in endpoint release function.
USB: small update to Documentation/usb/acm.txt
USB storage: fix ipod ejecting issue
USB Storage: unusual_devs: add supertop drives
USB: omap_udc build fixes (sync with linux-omap)
USB: funsoft is borken on sparc
USB: fix interaction between different interfaces in an "Option" usb device
UHCI: support device_may_wakeup
UHCI: make test for ASUS motherboard more specific
Diffstat (limited to 'drivers/usb/net/asix.c')
| -rw-r--r-- | drivers/usb/net/asix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c index 95e682e2c9d6..f538013965b0 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/usb/net/asix.c @@ -920,7 +920,7 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) goto out2; if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT, - 0x0000, 0, 0, buf)) < 0) { + 1, 0, 0, buf)) < 0) { dbg("Select PHY #1 failed: %d", ret); goto out2; } |