From 98e36a75789a2e9eccfd834e3b5e926c02f76293 Mon Sep 17 00:00:00 2001
From: Johan Hovold <jhovold@gmail.com>
Date: Wed, 5 Jun 2013 12:21:11 +0200
Subject: [PATCH] --- yaml --- r: 376743 b: refs/heads/master c:
 f4488035abdac56682153aa0cff3d1dce84e1c54 h: refs/heads/master i:   376741:
 25790cb26acda0b849738af5a908bca19f6a13f5   376739:
 945375f1ea4a21126cfbb978f68b736e749030a9   376735:
 60eb624c906736ec98594a70bbe7eda361ed490d v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/serial/usb-serial.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 56932856c0fa..dd1d95a24378 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a26f009a070e840fadacb91013b2391ba7ab6cc2
+refs/heads/master: f4488035abdac56682153aa0cff3d1dce84e1c54
diff --git a/trunk/drivers/usb/serial/usb-serial.c b/trunk/drivers/usb/serial/usb-serial.c
index 4753c005cfb6..5f6b1ff9d29e 100644
--- a/trunk/drivers/usb/serial/usb-serial.c
+++ b/trunk/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;