diff options
Diffstat (limited to 'drivers/usb/serial/iuu_phoenix.c')
| -rw-r--r-- | drivers/usb/serial/iuu_phoenix.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index 22b1eb5040b7..bf3864045c18 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c | |||
| @@ -921,7 +921,7 @@ static void iuu_set_termios(struct tty_struct *tty, | |||
| 921 | { | 921 | { |
| 922 | const u32 supported_mask = CMSPAR|PARENB|PARODD; | 922 | const u32 supported_mask = CMSPAR|PARENB|PARODD; |
| 923 | struct iuu_private *priv = usb_get_serial_port_data(port); | 923 | struct iuu_private *priv = usb_get_serial_port_data(port); |
| 924 | unsigned int cflag = tty->termios->c_cflag; | 924 | unsigned int cflag = tty->termios.c_cflag; |
| 925 | int status; | 925 | int status; |
| 926 | u32 actual; | 926 | u32 actual; |
| 927 | u32 parity; | 927 | u32 parity; |
| @@ -930,7 +930,7 @@ static void iuu_set_termios(struct tty_struct *tty, | |||
| 930 | u32 newval = cflag & supported_mask; | 930 | u32 newval = cflag & supported_mask; |
| 931 | 931 | ||
| 932 | /* Just use the ospeed. ispeed should be the same. */ | 932 | /* Just use the ospeed. ispeed should be the same. */ |
| 933 | baud = tty->termios->c_ospeed; | 933 | baud = tty->termios.c_ospeed; |
| 934 | 934 | ||
| 935 | dbg("%s - enter c_ospeed or baud=%d", __func__, baud); | 935 | dbg("%s - enter c_ospeed or baud=%d", __func__, baud); |
| 936 | 936 | ||
| @@ -961,13 +961,13 @@ static void iuu_set_termios(struct tty_struct *tty, | |||
| 961 | * settings back over and then adjust them | 961 | * settings back over and then adjust them |
| 962 | */ | 962 | */ |
| 963 | if (old_termios) | 963 | if (old_termios) |
| 964 | tty_termios_copy_hw(tty->termios, old_termios); | 964 | tty_termios_copy_hw(&tty->termios, old_termios); |
| 965 | if (status != 0) /* Set failed - return old bits */ | 965 | if (status != 0) /* Set failed - return old bits */ |
| 966 | return; | 966 | return; |
| 967 | /* Re-encode speed, parity and csize */ | 967 | /* Re-encode speed, parity and csize */ |
| 968 | tty_encode_baud_rate(tty, baud, baud); | 968 | tty_encode_baud_rate(tty, baud, baud); |
| 969 | tty->termios->c_cflag &= ~(supported_mask|CSIZE); | 969 | tty->termios.c_cflag &= ~(supported_mask|CSIZE); |
| 970 | tty->termios->c_cflag |= newval | csize; | 970 | tty->termios.c_cflag |= newval | csize; |
| 971 | } | 971 | } |
| 972 | 972 | ||
| 973 | static void iuu_close(struct usb_serial_port *port) | 973 | static void iuu_close(struct usb_serial_port *port) |
| @@ -993,14 +993,14 @@ static void iuu_close(struct usb_serial_port *port) | |||
| 993 | 993 | ||
| 994 | static void iuu_init_termios(struct tty_struct *tty) | 994 | static void iuu_init_termios(struct tty_struct *tty) |
| 995 | { | 995 | { |
| 996 | *(tty->termios) = tty_std_termios; | 996 | tty->termios = tty_std_termios; |
| 997 | tty->termios->c_cflag = CLOCAL | CREAD | CS8 | B9600 | 997 | tty->termios.c_cflag = CLOCAL | CREAD | CS8 | B9600 |
| 998 | | TIOCM_CTS | CSTOPB | PARENB; | 998 | | TIOCM_CTS | CSTOPB | PARENB; |
| 999 | tty->termios->c_ispeed = 9600; | 999 | tty->termios.c_ispeed = 9600; |
| 1000 | tty->termios->c_ospeed = 9600; | 1000 | tty->termios.c_ospeed = 9600; |
| 1001 | tty->termios->c_lflag = 0; | 1001 | tty->termios.c_lflag = 0; |
| 1002 | tty->termios->c_oflag = 0; | 1002 | tty->termios.c_oflag = 0; |
| 1003 | tty->termios->c_iflag = 0; | 1003 | tty->termios.c_iflag = 0; |
| 1004 | } | 1004 | } |
| 1005 | 1005 | ||
| 1006 | static int iuu_open(struct tty_struct *tty, struct usb_serial_port *port) | 1006 | static int iuu_open(struct tty_struct *tty, struct usb_serial_port *port) |
| @@ -1012,8 +1012,8 @@ static int iuu_open(struct tty_struct *tty, struct usb_serial_port *port) | |||
| 1012 | u32 actual; | 1012 | u32 actual; |
| 1013 | struct iuu_private *priv = usb_get_serial_port_data(port); | 1013 | struct iuu_private *priv = usb_get_serial_port_data(port); |
| 1014 | 1014 | ||
| 1015 | baud = tty->termios->c_ospeed; | 1015 | baud = tty->termios.c_ospeed; |
| 1016 | tty->termios->c_ispeed = baud; | 1016 | tty->termios.c_ispeed = baud; |
| 1017 | /* Re-encode speed */ | 1017 | /* Re-encode speed */ |
| 1018 | tty_encode_baud_rate(tty, baud, baud); | 1018 | tty_encode_baud_rate(tty, baud, baud); |
| 1019 | 1019 | ||
