diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /drivers/usb/usb.c | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'drivers/usb/usb.c')
| -rw-r--r-- | drivers/usb/usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/usb.c b/drivers/usb/usb.c index b291c04c6..bbce88b64 100644 --- a/drivers/usb/usb.c +++ b/drivers/usb/usb.c @@ -36,7 +36,6 @@ * 6 wLength 2 Count Bytes for data */ -#include <linux/config.h> #include <linux/string.h> #include <linux/bitops.h> #include <linux/malloc.h> @@ -773,7 +772,7 @@ int usb_clear_halt(struct usb_device *dev, int endp) /* toggle is reset on clear */ - usb_settoggle(dev, endp & 0x0f, 0); + usb_settoggle(dev, endp & 0x0f, ((endp >> 7) & 1) ^ 1, 0); return 0; } @@ -823,7 +822,8 @@ int usb_set_configuration(struct usb_device *dev, int configuration) return -1; dev->actconfig = cp; - dev->toggle = 0; + dev->toggle[0] = 0; + dev->toggle[1] = 0; usb_set_maxpacket(dev); return 0; } |