projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
drivers
/
usb
/
serial
/
quatech2.c
diff --git
a/drivers/usb/serial/quatech2.c
b/drivers/usb/serial/quatech2.c
index
5f2e7f6
..
067690d
100644
(file)
--- a/
drivers/usb/serial/quatech2.c
+++ b/
drivers/usb/serial/quatech2.c
@@
-416,7
+416,7
@@
static void qt2_close(struct usb_serial_port *port)
/* flush the port transmit buffer */
i = usb_control_msg(serial->dev,
/* flush the port transmit buffer */
i = usb_control_msg(serial->dev,
- usb_
rcv
ctrlpipe(serial->dev, 0),
+ usb_
snd
ctrlpipe(serial->dev, 0),
QT2_FLUSH_DEVICE, 0x40, 1,
port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);
QT2_FLUSH_DEVICE, 0x40, 1,
port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);
@@
-426,7
+426,7
@@
static void qt2_close(struct usb_serial_port *port)
/* flush the port receive buffer */
i = usb_control_msg(serial->dev,
/* flush the port receive buffer */
i = usb_control_msg(serial->dev,
- usb_
rcv
ctrlpipe(serial->dev, 0),
+ usb_
snd
ctrlpipe(serial->dev, 0),
QT2_FLUSH_DEVICE, 0x40, 0,
port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);
QT2_FLUSH_DEVICE, 0x40, 0,
port_priv->device_port, NULL, 0, QT2_USB_TIMEOUT);
@@
-639,7
+639,7
@@
static int qt2_attach(struct usb_serial *serial)
int status;
/* power on unit */
int status;
/* power on unit */
- status = usb_control_msg(serial->dev, usb_
rcv
ctrlpipe(serial->dev, 0),
+ status = usb_control_msg(serial->dev, usb_
snd
ctrlpipe(serial->dev, 0),
0xc2, 0x40, 0x8000, 0, NULL, 0,
QT2_USB_TIMEOUT);
if (status < 0) {
0xc2, 0x40, 0x8000, 0, NULL, 0,
QT2_USB_TIMEOUT);
if (status < 0) {