diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 17:08:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 17:08:47 -0500 |
commit | c6bd5bcc4983f1a2d2f87a3769bf309482ee8c04 (patch) | |
tree | 2ff9c4496dc2258d601a1bcd82040470704dae3b /arch/m68k | |
parent | 8966961b31c251b854169e9886394c2a20f2cea7 (diff) | |
parent | b0ab02361167faa82198b783a8d555eb6f58901c (diff) |
Merge tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY/Serial merge from Greg Kroah-Hartman:
"Here's the big tty/serial tree set of changes for 3.8-rc1.
Contained in here is a bunch more reworks of the tty port layer from
Jiri and bugfixes from Alan, along with a number of other tty and
serial driver updates by the various driver authors.
Also, Jiri has been coerced^Wconvinced to be the co-maintainer of the
TTY layer, which is much appreciated by me.
All of these have been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up some trivial conflicts in the staging tree, due to the fwserial
driver having come in both ways (but fixed up a bit in the serial tree),
and the ioctl handling in the dgrp driver having been done slightly
differently (staging tree got that one right, and removed both
TIOCGSOFTCAR and TIOCSSOFTCAR).
* tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (146 commits)
staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer()
staging/fwserial: Remove superfluous free
staging/fwserial: Use WARN_ONCE when port table is corrupted
staging/fwserial: Destruct embedded tty_port on teardown
staging/fwserial: Fix build breakage when !CONFIG_BUG
staging: fwserial: Add TTY-over-Firewire serial driver
drivers/tty/serial/serial_core.c: clean up HIGH_BITS_OFFSET usage
staging: dgrp: dgrp_tty.c: Audit the return values of get/put_user()
staging: dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp driver
serial: ifx6x60: Add modem power off function in the platform reboot process
serial: mxs-auart: unmap the scatter list before we copy the data
serial: mxs-auart: disable the Receive Timeout Interrupt when DMA is enabled
serial: max310x: Setup missing "can_sleep" field for GPIO
tty/serial: fix ifx6x60.c declaration warning
serial: samsung: add devicetree properties for non-Exynos SoCs
serial: samsung: fix potential soft lockup during uart write
tty: vt: Remove redundant null check before kfree.
tty/8250 Add check for pci_ioremap_bar failure
tty/8250 Add support for Commtech's Fastcom Async-335 and Fastcom Async-PCIe cards
tty/8250 Add XR17D15x devices to the exar_handle_irq override
...
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/emu/nfcon.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/m68k/emu/nfcon.c b/arch/m68k/emu/nfcon.c index 16d170f53bfd..6685bf45c2c3 100644 --- a/arch/m68k/emu/nfcon.c +++ b/arch/m68k/emu/nfcon.c | |||
@@ -120,8 +120,6 @@ static int __init nfcon_init(void) | |||
120 | { | 120 | { |
121 | int res; | 121 | int res; |
122 | 122 | ||
123 | tty_port_init(&nfcon_tty_port); | ||
124 | |||
125 | stderr_id = nf_get_id("NF_STDERR"); | 123 | stderr_id = nf_get_id("NF_STDERR"); |
126 | if (!stderr_id) | 124 | if (!stderr_id) |
127 | return -ENODEV; | 125 | return -ENODEV; |
@@ -130,6 +128,8 @@ static int __init nfcon_init(void) | |||
130 | if (!nfcon_tty_driver) | 128 | if (!nfcon_tty_driver) |
131 | return -ENOMEM; | 129 | return -ENOMEM; |
132 | 130 | ||
131 | tty_port_init(&nfcon_tty_port); | ||
132 | |||
133 | nfcon_tty_driver->driver_name = "nfcon"; | 133 | nfcon_tty_driver->driver_name = "nfcon"; |
134 | nfcon_tty_driver->name = "nfcon"; | 134 | nfcon_tty_driver->name = "nfcon"; |
135 | nfcon_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM; | 135 | nfcon_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM; |
@@ -143,6 +143,7 @@ static int __init nfcon_init(void) | |||
143 | if (res) { | 143 | if (res) { |
144 | pr_err("failed to register nfcon tty driver\n"); | 144 | pr_err("failed to register nfcon tty driver\n"); |
145 | put_tty_driver(nfcon_tty_driver); | 145 | put_tty_driver(nfcon_tty_driver); |
146 | tty_port_destroy(&nfcon_tty_port); | ||
146 | return res; | 147 | return res; |
147 | } | 148 | } |
148 | 149 | ||
@@ -157,6 +158,7 @@ static void __exit nfcon_exit(void) | |||
157 | unregister_console(&nf_console); | 158 | unregister_console(&nf_console); |
158 | tty_unregister_driver(nfcon_tty_driver); | 159 | tty_unregister_driver(nfcon_tty_driver); |
159 | put_tty_driver(nfcon_tty_driver); | 160 | put_tty_driver(nfcon_tty_driver); |
161 | tty_port_destroy(&nfcon_tty_port); | ||
160 | } | 162 | } |
161 | 163 | ||
162 | module_init(nfcon_init); | 164 | module_init(nfcon_init); |