aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/usb-serial.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-02-14 16:27:06 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 11:59:14 -0800
commit00a0d0d65b61241a718d0aee96f46b9a2d93bf26 (patch)
treeedca1d6b83d92fcce4c4c48d6308057f99c35a37 /drivers/usb/serial/usb-serial.c
parenttiocmset: kill the file pointer argument (diff)
downloadlinux-dev-00a0d0d65b61241a718d0aee96f46b9a2d93bf26.tar.xz
linux-dev-00a0d0d65b61241a718d0aee96f46b9a2d93bf26.zip
tty: remove filp from the USB tty ioctls
We don't use it so we can trim it from here as we try and stamp the file object dependencies out of the serial code. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r--drivers/usb/serial/usb-serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index dab679e5b7ea..b1110e136c33 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -417,7 +417,7 @@ static int serial_ioctl(struct tty_struct *tty, struct file *file,
/* pass on to the driver specific version of this function
if it is available */
if (port->serial->type->ioctl) {
- retval = port->serial->type->ioctl(tty, file, cmd, arg);
+ retval = port->serial->type->ioctl(tty, cmd, arg);
} else
retval = -ENOIOCTLCMD;
return retval;