summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-07-02 14:15:40 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-07-02 14:15:40 +1000
commit9c15b5eef89c92929b6acf8b87261d2cf20f96b3 (patch)
tree712f278e53ca99bcb7f18afb17a9b667040562bc
parent8d67c2bbc9bca3e12bb203f79d6d1d23cf76f019 (diff)
55-tty-usb-kobil-sct-ioctl
Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/kobil_sct.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index f0f8353ec1ac..deba28ec77e8 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -640,9 +640,11 @@ static void kobil_set_termios(struct tty_struct *tty,
priv = usb_get_serial_port_data(port);
if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID ||
- priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID)
+ priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
/* This device doesn't support ioctl calls */
+ *tty->termios = *old;
return;
+ }
speed = tty_get_baud_rate(tty);
switch (speed) {
@@ -704,7 +706,7 @@ static int kobil_ioctl(struct tty_struct *tty, struct file *file,
if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID ||
priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID)
/* This device doesn't support ioctl calls */
- return 0;
+ return -ENOIOCTLCMD;
switch (cmd) {
case TCFLSH: