diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 14:24:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-20 14:24:39 -0400 |
commit | 843ec558f91b8e8fdb6efc908f2c0506407cc750 (patch) | |
tree | 1866dccbc298390fc8686875942324075fd83f9d /drivers/tty/synclink.c | |
parent | 71e7ff2578c3bc67fd893a9ba7f69fd563f271de (diff) | |
parent | fb8ebec00b04f921ea1614a7303f1a8e5e9e47c5 (diff) |
Merge tag 'tty-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY/serial patches from Greg KH:
"tty and serial merge for 3.4-rc1
Here's the big serial and tty merge for the 3.4-rc1 tree.
There's loads of fixes and reworks in here from Jiri for the tty
layer, and a number of patches from Alan to help try to wrestle the vt
layer into a sane model.
Other than that, lots of driver updates and fixes, and other minor
stuff, all detailed in the shortlog."
* tag 'tty-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (132 commits)
serial: pxa: add clk_prepare/clk_unprepare calls
TTY: Wrong unicode value copied in con_set_unimap()
serial: PL011: clear pending interrupts
serial: bfin-uart: Don't access tty circular buffer in TX DMA interrupt after it is reset.
vt: NULL dereference in vt_do_kdsk_ioctl()
tty: serial: vt8500: fix annotations for probe/remove
serial: remove back and forth conversions in serial_out_sync
serial: use serial_port_in/out vs serial_in/out in 8250
serial: introduce generic port in/out helpers
serial: reduce number of indirections in 8250 code
serial: delete useless void casts in 8250.c
serial: make 8250's serial_in shareable to other drivers.
serial: delete last unused traces of pausing I/O in 8250
pch_uart: Add module parameter descriptions
pch_uart: Use existing default_baud in setup_console
pch_uart: Add user_uartclk parameter
pch_uart: Add Fish River Island II uart clock quirks
pch_uart: Use uartclk instead of base_baud
mpc5200b/uart: select more tolerant uart prescaler on low baudrates
tty: moxa: fix bit test in moxa_start()
...
Diffstat (limited to 'drivers/tty/synclink.c')
-rw-r--r-- | drivers/tty/synclink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c index ff8017f87914..8e518da85fd5 100644 --- a/drivers/tty/synclink.c +++ b/drivers/tty/synclink.c | |||
@@ -3381,7 +3381,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp) | |||
3381 | 3381 | ||
3382 | /* verify range of specified line number */ | 3382 | /* verify range of specified line number */ |
3383 | line = tty->index; | 3383 | line = tty->index; |
3384 | if ((line < 0) || (line >= mgsl_device_count)) { | 3384 | if (line >= mgsl_device_count) { |
3385 | printk("%s(%d):mgsl_open with invalid line #%d.\n", | 3385 | printk("%s(%d):mgsl_open with invalid line #%d.\n", |
3386 | __FILE__,__LINE__,line); | 3386 | __FILE__,__LINE__,line); |
3387 | return -ENODEV; | 3387 | return -ENODEV; |
@@ -4333,7 +4333,6 @@ static int mgsl_init_tty(void) | |||
4333 | if (!serial_driver) | 4333 | if (!serial_driver) |
4334 | return -ENOMEM; | 4334 | return -ENOMEM; |
4335 | 4335 | ||
4336 | serial_driver->owner = THIS_MODULE; | ||
4337 | serial_driver->driver_name = "synclink"; | 4336 | serial_driver->driver_name = "synclink"; |
4338 | serial_driver->name = "ttySL"; | 4337 | serial_driver->name = "ttySL"; |
4339 | serial_driver->major = ttymajor; | 4338 | serial_driver->major = ttymajor; |