diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:27:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:27:51 +0200 |
| commit | 141dc40ee343ab532717b235dd645e2d25ae3092 (patch) | |
| tree | 2289e5d1ec20df5e465b9b629e291877f4d70485 /drivers/usb/serial/usb-serial.c | |
| parent | Merge tag 'for-usb-next-2013-06-06' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Linux 3.10-rc5 (diff) | |
| download | linux-141dc40ee343ab532717b235dd645e2d25ae3092.tar.xz linux-141dc40ee343ab532717b235dd645e2d25ae3092.zip | |
Merge 3.10-rc5 into usb-next
We need the changes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 4753c005cfb6..5f6b1ff9d29e 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -408,7 +408,7 @@ static int serial_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct usb_serial_port *port = tty->driver_data; - int retval = -ENODEV; + int retval = -ENOIOCTLCMD; dev_dbg(tty->dev, "%s - cmd 0x%.4x\n", __func__, cmd); @@ -420,8 +420,6 @@ static int serial_ioctl(struct tty_struct *tty, default: if (port->serial->type->ioctl) retval = port->serial->type->ioctl(tty, cmd, arg); - else - retval = -ENOIOCTLCMD; } return retval; |