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/opticon.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/opticon.c')
| -rw-r--r-- | drivers/usb/serial/opticon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index ce82396fc4e8..201f6096844b 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
| @@ -391,7 +391,7 @@ static void opticon_unthrottle(struct tty_struct *tty) | |||
| 391 | } | 391 | } |
| 392 | } | 392 | } |
| 393 | 393 | ||
| 394 | static int opticon_tiocmget(struct tty_struct *tty, struct file *file) | 394 | static int opticon_tiocmget(struct tty_struct *tty) |
| 395 | { | 395 | { |
| 396 | struct usb_serial_port *port = tty->driver_data; | 396 | struct usb_serial_port *port = tty->driver_data; |
| 397 | struct opticon_private *priv = usb_get_serial_data(port->serial); | 397 | struct opticon_private *priv = usb_get_serial_data(port->serial); |
| @@ -468,7 +468,7 @@ static int get_serial_info(struct opticon_private *priv, | |||
| 468 | return 0; | 468 | return 0; |
| 469 | } | 469 | } |
| 470 | 470 | ||
| 471 | static int opticon_ioctl(struct tty_struct *tty, struct file *file, | 471 | static int opticon_ioctl(struct tty_struct *tty, |
| 472 | unsigned int cmd, unsigned long arg) | 472 | unsigned int cmd, unsigned long arg) |
| 473 | { | 473 | { |
| 474 | struct usb_serial_port *port = tty->driver_data; | 474 | struct usb_serial_port *port = tty->driver_data; |