lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: ipw: clean up dtr-rts handling

Browse Source 
No need to raise dtr/rts in open as this is taken care of by tty layer.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Johan Hovold
2010-05-13 21:33:08 +02:00
committed by Greg Kroah-Hartman
parent f4a4cbb204
commit 605204bfb0
1 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/usb/serial/ipw.c
View File

@@ -267,35 +267,6 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
dev_err(&port->dev, dev_err(&port->dev,
"initial flowcontrol failed (error = %d)\n", result); "initial flowcontrol failed (error = %d)\n", result);
/*--5: raise the dtr */
dbg("%s:raising dtr", __func__);
result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
IPW_SIO_SET_PIN,
USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
IPW_PIN_SETDTR,
0,
NULL,
0,
200000);
if (result < 0)
dev_err(&port->dev,
"setting dtr failed (error = %d)\n", result);
/*--6: raise the rts */
dbg("%s:raising rts", __func__);
result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
IPW_SIO_SET_PIN,
USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
IPW_PIN_SETRTS,
0,
NULL,
0,
200000);
if (result < 0)
dev_err(&port->dev,
"setting dtr failed (error = %d)\n", result);
kfree(buf_flow_init); kfree(buf_flow_init);
return 0; return 0;
} }
@@ -305,8 +276,8 @@ static void ipw_dtr_rts(struct usb_serial_port *port, int on)
struct usb_device *dev = port->serial->dev; struct usb_device *dev = port->serial->dev;
int result; int result;
/*--1: drop the dtr */ dbg("%s: on = %d", __func__, on);
dbg("%s:dropping dtr", __func__);
result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
IPW_SIO_SET_PIN, IPW_SIO_SET_PIN,
USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT, USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
@@ -316,22 +287,20 @@ static void ipw_dtr_rts(struct usb_serial_port *port, int on)
0, 0,
200000); 200000);
if (result < 0) if (result < 0)
dev_err(&port->dev, "dropping dtr failed (error = %d)\n", dev_err(&port->dev, "setting dtr failed (error = %d)\n",
result); result);
/*--2: drop the rts */
dbg("%s:dropping rts", __func__);
result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
IPW_SIO_SET_PIN, USB_TYPE_VENDOR | IPW_SIO_SET_PIN, USB_TYPE_VENDOR |
USB_RECIP_INTERFACE | USB_DIR_OUT, USB_RECIP_INTERFACE | USB_DIR_OUT,
on ? IPW_PIN_SETRTS : IPW_PIN_CLRRTS, on ? IPW_PIN_SETRTS : IPW_PIN_CLRRTS,
0, 0,
NULL, NULL,
0, 0,
200000); 200000);
if (result < 0) if (result < 0)
dev_err(&port->dev, dev_err(&port->dev, "setting rts failed (error = %d)\n",
"dropping rts failed (error = %d)\n", result); result);
} }
static void ipw_close(struct usb_serial_port *port) static void ipw_close(struct usb_serial_port *port)