From 7890bfbddeaffd6667261a9469de4675b3a528fb Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 21 Mar 2013 12:37:44 +0100 Subject: [PATCH] --- yaml --- r: 364465 b: refs/heads/master c: aff5b323b319758257a838cdc45f494c6674447c h: refs/heads/master i: 364463: 38ea8020abc1e0383b90bbbc9ab9d638c85be7b4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/pl2303.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 13871faed91a..81e76b1c2fee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94bcef624548fd2bcf94cb7f9fcbaedbd96d5742 +refs/heads/master: aff5b323b319758257a838cdc45f494c6674447c diff --git a/trunk/drivers/usb/serial/pl2303.c b/trunk/drivers/usb/serial/pl2303.c index 997eba4dcbeb..4dff17902fa0 100644 --- a/trunk/drivers/usb/serial/pl2303.c +++ b/trunk/drivers/usb/serial/pl2303.c @@ -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;