Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364465
b: refs/heads/master
c: aff5b32
h: refs/heads/master
i:
  364463: 38ea802
v: v3
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Mar 25, 2013
1 parent 4cdd6f6 commit 7890bfb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 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: 94bcef624548fd2bcf94cb7f9fcbaedbd96d5742
refs/heads/master: aff5b323b319758257a838cdc45f494c6674447c
7 changes: 5 additions & 2 deletions trunk/drivers/usb/serial/pl2303.c
Original file line number Diff line number Diff line change
Expand Up @@ -550,10 +550,13 @@ static int pl2303_tiocmset(struct tty_struct *tty,
spin_unlock_irqrestore(&priv->lock, flags);

mutex_lock(&serial->disc_mutex);
if (!serial->disconnected)
if (!serial->disconnected) {
ret = pl2303_set_control_lines(port, control);
else
if (ret)
ret = usb_translate_errors(ret);
} else {
ret = -ENODEV;
}
mutex_unlock(&serial->disc_mutex);

return ret;
Expand Down

0 comments on commit 7890bfb

Please sign in to comment.