diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-05 03:51:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-05 03:51:19 +0200 |
| commit | 79eb238c76782a59d51adf8a3dd7f6444245b475 (patch) | |
| tree | 73bd8c89a1ef19ec01a7592f189bbc0f52847185 /drivers/char | |
| parent | Merge tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | tty/n_gsm.c: fix a memory leak in gsmld_open (diff) | |
| download | linux-79eb238c76782a59d51adf8a3dd7f6444245b475.tar.xz linux-79eb238c76782a59d51adf8a3dd7f6444245b475.zip | |
Merge tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty / serial driver update from Greg KH:
"Here's the big tty / serial driver update for 3.17-rc1.
Nothing major, just a number of fixes and new features for different
serial drivers, and some more tty core fixes and documentation of the
tty locks.
All of these have been in linux-next for a while"
* tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (82 commits)
tty/n_gsm.c: fix a memory leak in gsmld_open
pch_uart: don't hardcode PCI slot to get DMA device
tty: n_gsm, use setup_timer
Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console"
serial: sc16is7xx: Correct initialization of s->clk
serial: 8250_dw: Add support for deferred probing
serial: 8250_dw: Add optional reset control support
serial: st-asc: Fix overflow in baudrate calculation
serial: st-asc: Don't call BUG in asc_console_setup()
tty: serial: msm: Make of_device_id array const
tty/n_gsm.c: get gsm->num after gsm_activate_mux
serial/core: Fix too big allocation for attribute member
drivers/tty/serial: use correct type for dma_map/unmap
serial: altera_jtaguart: Fix putchar function passed to uart_console_write()
serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers
Serial: allow port drivers to have a default attribute group
tty: kgdb_nmi: Automatically manage tty enable
serial: altera_jtaguart: Adpot uart_console_write()
serial: samsung: improve code clarity by defining a variable
serial: samsung: correct the case and default order in switch
...
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 8320abd1ef14..0ea9986059af 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -2347,8 +2347,6 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp) printk("%s(%d):mgslpc_close(%s) entry, count=%d\n", __FILE__, __LINE__, info->device_name, port->count); - WARN_ON(!port->count); - if (tty_port_close_start(port, tty, filp) == 0) goto cleanup; @@ -2510,7 +2508,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp) __FILE__, __LINE__, tty->driver->name, port->count); /* If port is closing, signal caller to try again */ - if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){ + if (port->flags & ASYNC_CLOSING){ wait_event_interruptible_tty(tty, port->close_wait, !(port->flags & ASYNC_CLOSING)); retval = ((port->flags & ASYNC_HUP_NOTIFY) ? |