diff options
Diffstat (limited to 'drivers/usb/serial/ch341.c')
-rw-r--r-- | drivers/usb/serial/ch341.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index ba28fdc9ccd2..f61e3ca64305 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
@@ -28,6 +28,7 @@ static int debug; | |||
28 | 28 | ||
29 | static struct usb_device_id id_table [] = { | 29 | static struct usb_device_id id_table [] = { |
30 | { USB_DEVICE(0x4348, 0x5523) }, | 30 | { USB_DEVICE(0x4348, 0x5523) }, |
31 | { USB_DEVICE(0x1a86, 0x7523) }, | ||
31 | { }, | 32 | { }, |
32 | }; | 33 | }; |
33 | MODULE_DEVICE_TABLE(usb, id_table); | 34 | MODULE_DEVICE_TABLE(usb, id_table); |
@@ -231,7 +232,8 @@ error: kfree(priv); | |||
231 | } | 232 | } |
232 | 233 | ||
233 | /* open this device, set default parameters */ | 234 | /* open this device, set default parameters */ |
234 | static int ch341_open(struct usb_serial_port *port, struct file *filp) | 235 | static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port, |
236 | struct file *filp) | ||
235 | { | 237 | { |
236 | struct usb_serial *serial = port->serial; | 238 | struct usb_serial *serial = port->serial; |
237 | struct ch341_private *priv = usb_get_serial_port_data(serial->port[0]); | 239 | struct ch341_private *priv = usb_get_serial_port_data(serial->port[0]); |
@@ -255,7 +257,7 @@ static int ch341_open(struct usb_serial_port *port, struct file *filp) | |||
255 | if (r) | 257 | if (r) |
256 | goto out; | 258 | goto out; |
257 | 259 | ||
258 | r = usb_serial_generic_open(port, filp); | 260 | r = usb_serial_generic_open(tty, port, filp); |
259 | 261 | ||
260 | out: return r; | 262 | out: return r; |
261 | } | 263 | } |
@@ -263,11 +265,10 @@ out: return r; | |||
263 | /* Old_termios contains the original termios settings and | 265 | /* Old_termios contains the original termios settings and |
264 | * tty->termios contains the new setting to be used. | 266 | * tty->termios contains the new setting to be used. |
265 | */ | 267 | */ |
266 | static void ch341_set_termios(struct usb_serial_port *port, | 268 | static void ch341_set_termios(struct tty_struct *tty, |
267 | struct ktermios *old_termios) | 269 | struct usb_serial_port *port, struct ktermios *old_termios) |
268 | { | 270 | { |
269 | struct ch341_private *priv = usb_get_serial_port_data(port); | 271 | struct ch341_private *priv = usb_get_serial_port_data(port); |
270 | struct tty_struct *tty = port->tty; | ||
271 | unsigned baud_rate; | 272 | unsigned baud_rate; |
272 | 273 | ||
273 | dbg("ch341_set_termios()"); | 274 | dbg("ch341_set_termios()"); |