summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2012-01-10 23:33:37 +0100
committerSimone Willett <swillett@nvidia.com>2012-02-09 15:32:23 -0800
commitd7d55f41b54967769fad9aebe3c7a1744cbd0fd4 (patch)
treefbbb19c0d1511dd13c234f9006e048b603a0ef42
parentd6f4da1e2f5ccff58e22880cff4024e5bca633d8 (diff)
USB: ftdi_sio: fix TIOCSSERIAL baud_base handling
commit eb833a9e0972f60beb4ab8104ad7ef6bf30f02fc upstream. Return EINVAL if new baud_base does not match the current one. The baud_base is device specific and can not be changed. This restores the old (pre-2005) behaviour which was changed due to a misunderstanding regarding this fact (see https://lkml.org/lkml/2005/1/20/84). Reported-by: Torbjörn Lofterud <torbjorn@pi.nxs.se> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Change-Id: I672bd484e4c55708f0e97c83037c5acbc7b9e7c7 Reviewed-on: http://git-master/r/79666 Reviewed-by: Automatic_Commit_Validation_User
-rw-r--r--drivers/usb/serial/ftdi_sio.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index bbd2cdd669a4..b45091e45f13 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1329,8 +1329,7 @@ static int set_serial_info(struct tty_struct *tty,
goto check_and_exit;
}
- if ((new_serial.baud_base != priv->baud_base) &&
- (new_serial.baud_base < 9600)) {
+ if (new_serial.baud_base != priv->baud_base) {
mutex_unlock(&priv->cfg_lock);
return -EINVAL;
}