Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185258
b: refs/heads/master
c: 2805eb1
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger authored and Greg Kroah-Hartman committed Mar 2, 2010
1 parent 9f94117 commit f5becdc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 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: 64319dd74f3d45f13b6d0aafa91104eb105f1829
refs/heads/master: 2805eb13c3b5be7bd6ec7380502bc054b570afd5
9 changes: 3 additions & 6 deletions trunk/drivers/usb/serial/cypress_m8.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,15 +352,12 @@ static int cypress_serial_control(struct tty_struct *tty,

switch (cypress_request_type) {
case CYPRESS_SET_CONFIG:
new_baudrate = priv->baud_rate;
/* 0 means 'Hang up' so doesn't change the true bit rate */
if (baud_rate == 0)
new_baudrate = priv->baud_rate;
/* Change of speed ? */
else if (baud_rate != priv->baud_rate) {
new_baudrate = priv->baud_rate;
if (baud_rate && baud_rate != priv->baud_rate) {
dbg("%s - baud rate is changing", __func__);
retval = analyze_baud_rate(port, baud_rate);
if (retval >= 0) {
if (retval >= 0) {
new_baudrate = retval;
dbg("%s - New baud rate set to %d",
__func__, new_baudrate);
Expand Down

0 comments on commit f5becdc

Please sign in to comment.