diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:11:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 18:11:04 -0400 |
commit | e6bee325e49f17c65c1fd66e9e8b348c85788341 (patch) | |
tree | bcc9e5d8e82efa9009edd481a837cc3626360091 /drivers/usb/serial/ch341.c | |
parent | a5e6b135bdff649e4330f98e2e80dbb1984f7e77 (diff) | |
parent | 6ae705b23be8da52d3163be9d81e9b767876aaf9 (diff) |
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
pch_uart: reference clock on CM-iTC
pch_phub: add new device ML7213
n_gsm: fix UIH control byte : P bit should be 0
n_gsm: add a documentation
serial: msm_serial_hs: Add MSM high speed UART driver
tty_audit: fix tty_audit_add_data live lock on audit disabled
tty: move cd1865.h to drivers/staging/tty/
Staging: tty: fix build with epca.c driver
pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
Staging: generic_serial: fix double locking bug
nozomi: don't use flush_scheduled_work()
tty/serial: Relax the device_type restriction from of_serial
MAINTAINERS: Update HVC file patterns
tty: phase out of ioctl file pointer for tty3270 as well
tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
pch_uart: Fix DMA channel miss-setting issue.
pch_uart: fix exclusive access issue
pch_uart: fix auto flow control miss-setting issue
pch_uart: fix uart clock setting issue
pch_uart : Use dev_xxx not pr_xxx
...
Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
Diffstat (limited to 'drivers/usb/serial/ch341.c')
-rw-r--r-- | drivers/usb/serial/ch341.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 14ac87ee9251..6ae1c0688b5e 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
@@ -432,7 +432,7 @@ out: | |||
432 | kfree(break_reg); | 432 | kfree(break_reg); |
433 | } | 433 | } |
434 | 434 | ||
435 | static int ch341_tiocmset(struct tty_struct *tty, struct file *file, | 435 | static int ch341_tiocmset(struct tty_struct *tty, |
436 | unsigned int set, unsigned int clear) | 436 | unsigned int set, unsigned int clear) |
437 | { | 437 | { |
438 | struct usb_serial_port *port = tty->driver_data; | 438 | struct usb_serial_port *port = tty->driver_data; |
@@ -553,8 +553,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) | |||
553 | return 0; | 553 | return 0; |
554 | } | 554 | } |
555 | 555 | ||
556 | /*static int ch341_ioctl(struct usb_serial_port *port, struct file *file,*/ | 556 | static int ch341_ioctl(struct tty_struct *tty, |
557 | static int ch341_ioctl(struct tty_struct *tty, struct file *file, | ||
558 | unsigned int cmd, unsigned long arg) | 557 | unsigned int cmd, unsigned long arg) |
559 | { | 558 | { |
560 | struct usb_serial_port *port = tty->driver_data; | 559 | struct usb_serial_port *port = tty->driver_data; |
@@ -573,7 +572,7 @@ static int ch341_ioctl(struct tty_struct *tty, struct file *file, | |||
573 | return -ENOIOCTLCMD; | 572 | return -ENOIOCTLCMD; |
574 | } | 573 | } |
575 | 574 | ||
576 | static int ch341_tiocmget(struct tty_struct *tty, struct file *file) | 575 | static int ch341_tiocmget(struct tty_struct *tty) |
577 | { | 576 | { |
578 | struct usb_serial_port *port = tty->driver_data; | 577 | struct usb_serial_port *port = tty->driver_data; |
579 | struct ch341_private *priv = usb_get_serial_port_data(port); | 578 | struct ch341_private *priv = usb_get_serial_port_data(port); |