diff options
author | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
---|---|---|
committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/fwserial | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/fwserial')
-rw-r--r-- | kernel/drivers/staging/fwserial/dma_fifo.c | 2 | ||||
-rw-r--r-- | kernel/drivers/staging/fwserial/fwserial.c | 5 | ||||
-rw-r--r-- | kernel/drivers/staging/fwserial/fwserial.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/kernel/drivers/staging/fwserial/dma_fifo.c b/kernel/drivers/staging/fwserial/dma_fifo.c index 027906249..7a3347c3d 100644 --- a/kernel/drivers/staging/fwserial/dma_fifo.c +++ b/kernel/drivers/staging/fwserial/dma_fifo.c @@ -56,7 +56,7 @@ void dma_fifo_init(struct dma_fifo *fifo) * @size: 'apparent' size, in bytes, of fifo * @align: dma alignment to maintain (should be at least cpu cache alignment), * must be power of 2 - * @tx_limit: maximum # of bytes transmissable per dma (rounded down to + * @tx_limit: maximum # of bytes transmissible per dma (rounded down to * multiple of alignment, but at least align size) * @open_limit: maximum # of outstanding dma transactions allowed * @gfp_mask: get_free_pages mask, passed to kmalloc() diff --git a/kernel/drivers/staging/fwserial/fwserial.c b/kernel/drivers/staging/fwserial/fwserial.c index fdb2418c5..b3ea4bb54 100644 --- a/kernel/drivers/staging/fwserial/fwserial.c +++ b/kernel/drivers/staging/fwserial/fwserial.c @@ -2815,13 +2815,14 @@ static int __init fwserial_init(void) /* num_ttys/num_ports must not be set above the static alloc avail */ if (num_ttys + num_loops > MAX_CARD_PORTS) num_ttys = MAX_CARD_PORTS - num_loops; + num_ports = num_ttys + num_loops; fwtty_driver = tty_alloc_driver(MAX_TOTAL_PORTS, TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV); if (IS_ERR(fwtty_driver)) { err = PTR_ERR(fwtty_driver); - return err; + goto remove_debugfs; } fwtty_driver->driver_name = KBUILD_MODNAME; @@ -2923,7 +2924,9 @@ unregister_driver: tty_unregister_driver(fwtty_driver); put_tty: put_tty_driver(fwtty_driver); +remove_debugfs: debugfs_remove_recursive(fwserial_debugfs); + return err; } diff --git a/kernel/drivers/staging/fwserial/fwserial.h b/kernel/drivers/staging/fwserial/fwserial.h index 98b853d4a..787aa4f3a 100644 --- a/kernel/drivers/staging/fwserial/fwserial.h +++ b/kernel/drivers/staging/fwserial/fwserial.h @@ -218,7 +218,7 @@ struct fwconsole_ops { * prevented with the IN_TX flag. Scheduled under lock to * limit scheduling when fifo has just been drained. * @tx_fifo: fifo used to store & block-up writes for dma to remote - * @max_payload: max bytes transmissable per dma (based on peer's max_payload) + * @max_payload: max bytes transmissible per dma (based on peer's max_payload) * @status_mask: UART_LSR_* bitmask significant to rx (based on termios) * @ignore_mask: UART_LSR_* bitmask of states to ignore (also based on termios) * @break_ctl: if set, port is 'sending break' to remote |