Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316868
b: refs/heads/master
c: c50f2af
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Jun 20, 2012
1 parent 420265b commit 817865b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 996a776544cc8a71653ffa95a89c317f33d2cb4a
refs/heads/master: c50f2af8e1a33e95e4d3b7af9db05ed9096c6072
4 changes: 0 additions & 4 deletions trunk/drivers/usb/serial/quatech2.c
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ static void qt2_set_termios(struct tty_struct *tty,
static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
{
struct usb_serial *serial;
struct qt2_serial_private *serial_priv;
struct qt2_port_private *port_priv;
u8 *data;
u16 device_port;
Expand All @@ -357,7 +356,6 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
serial = port->serial;

port_priv = usb_get_serial_port_data(port);
serial_priv = usb_get_serial_data(serial);

/* set the port to RS232 mode */
status = qt2_control_msg(serial->dev, QT2_GET_SET_QMCR,
Expand Down Expand Up @@ -417,13 +415,11 @@ static int qt2_open(struct tty_struct *tty, struct usb_serial_port *port)
static void qt2_close(struct usb_serial_port *port)
{
struct usb_serial *serial;
struct qt2_serial_private *serial_priv;
struct qt2_port_private *port_priv;
unsigned long flags;
int i;

serial = port->serial;
serial_priv = usb_get_serial_data(serial);
port_priv = usb_get_serial_port_data(port);

port_priv->is_open = false;
Expand Down

0 comments on commit 817865b

Please sign in to comment.