diff options
Diffstat (limited to 'drivers/usb/serial/cypress_m8.c')
-rw-r--r-- | drivers/usb/serial/cypress_m8.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 093f303b3189..a1fdb85b8c0a 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -143,7 +143,7 @@ struct cypress_private { | |||
143 | wait_queue_head_t delta_msr_wait; /* used for TIOCMIWAIT */ | 143 | wait_queue_head_t delta_msr_wait; /* used for TIOCMIWAIT */ |
144 | char prev_status, diff_status; /* used for TIOCMIWAIT */ | 144 | char prev_status, diff_status; /* used for TIOCMIWAIT */ |
145 | /* we pass a pointer to this as the arguement sent to cypress_set_termios old_termios */ | 145 | /* we pass a pointer to this as the arguement sent to cypress_set_termios old_termios */ |
146 | struct termios tmp_termios; /* stores the old termios settings */ | 146 | struct ktermios tmp_termios; /* stores the old termios settings */ |
147 | }; | 147 | }; |
148 | 148 | ||
149 | /* write buffer structure */ | 149 | /* write buffer structure */ |
@@ -165,7 +165,7 @@ static int cypress_write (struct usb_serial_port *port, const unsigned char *b | |||
165 | static void cypress_send (struct usb_serial_port *port); | 165 | static void cypress_send (struct usb_serial_port *port); |
166 | static int cypress_write_room (struct usb_serial_port *port); | 166 | static int cypress_write_room (struct usb_serial_port *port); |
167 | static int cypress_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); | 167 | static int cypress_ioctl (struct usb_serial_port *port, struct file * file, unsigned int cmd, unsigned long arg); |
168 | static void cypress_set_termios (struct usb_serial_port *port, struct termios * old); | 168 | static void cypress_set_termios (struct usb_serial_port *port, struct ktermios * old); |
169 | static int cypress_tiocmget (struct usb_serial_port *port, struct file *file); | 169 | static int cypress_tiocmget (struct usb_serial_port *port, struct file *file); |
170 | static int cypress_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear); | 170 | static int cypress_tiocmset (struct usb_serial_port *port, struct file *file, unsigned int set, unsigned int clear); |
171 | static int cypress_chars_in_buffer (struct usb_serial_port *port); | 171 | static int cypress_chars_in_buffer (struct usb_serial_port *port); |
@@ -949,13 +949,13 @@ static int cypress_ioctl (struct usb_serial_port *port, struct file * file, unsi | |||
949 | 949 | ||
950 | switch (cmd) { | 950 | switch (cmd) { |
951 | case TIOCGSERIAL: | 951 | case TIOCGSERIAL: |
952 | if (copy_to_user((void __user *)arg, port->tty->termios, sizeof(struct termios))) { | 952 | if (copy_to_user((void __user *)arg, port->tty->termios, sizeof(struct ktermios))) { |
953 | return -EFAULT; | 953 | return -EFAULT; |
954 | } | 954 | } |
955 | return (0); | 955 | return (0); |
956 | break; | 956 | break; |
957 | case TIOCSSERIAL: | 957 | case TIOCSSERIAL: |
958 | if (copy_from_user(port->tty->termios, (void __user *)arg, sizeof(struct termios))) { | 958 | if (copy_from_user(port->tty->termios, (void __user *)arg, sizeof(struct ktermios))) { |
959 | return -EFAULT; | 959 | return -EFAULT; |
960 | } | 960 | } |
961 | /* here we need to call cypress_set_termios to invoke the new settings */ | 961 | /* here we need to call cypress_set_termios to invoke the new settings */ |
@@ -1019,7 +1019,7 @@ static int cypress_ioctl (struct usb_serial_port *port, struct file * file, unsi | |||
1019 | 1019 | ||
1020 | 1020 | ||
1021 | static void cypress_set_termios (struct usb_serial_port *port, | 1021 | static void cypress_set_termios (struct usb_serial_port *port, |
1022 | struct termios *old_termios) | 1022 | struct ktermios *old_termios) |
1023 | { | 1023 | { |
1024 | struct cypress_private *priv = usb_get_serial_port_data(port); | 1024 | struct cypress_private *priv = usb_get_serial_port_data(port); |
1025 | struct tty_struct *tty; | 1025 | struct tty_struct *tty; |