Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 287001
b: refs/heads/master
c: 55b2afb
h: refs/heads/master
i:
  286999: c293acc
v: v3
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Jan 24, 2012
1 parent a9966e1 commit 3224e49
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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: 791b7d7cf69de11275e4dccec2f538eec02cbff6
refs/heads/master: 55b2afbb92ad92e9f6b0aa4354eb1c94589280c3
7 changes: 2 additions & 5 deletions trunk/drivers/usb/serial/cp210x.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,10 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
return result;
}

result = usb_serial_generic_open(tty, port);
if (result)
return result;

/* Configure the termios structure */
cp210x_get_termios(tty, port);
return 0;

return usb_serial_generic_open(tty, port);
}

static void cp210x_close(struct usb_serial_port *port)
Expand Down

0 comments on commit 3224e49

Please sign in to comment.