Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcfeda9d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull tty/serial fixes from Greg KH:
 "Here are a few small tty/serial driver fixes for 4.4-rc2 that resolve
  some reported problems.

  All have been in linux-next, full details are in the shortlog below"

* tag 'tty-4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: export fsl8250_handle_irq
  serial: 8250_mid: Add missing dependency
  tty: audit: Fix audit source
  serial: etraxfs-uart: Fix crash
  serial: fsl_lpuart: Fix earlycon support
  bcm63xx_uart: Use the device name when registering an interrupt
  tty: Fix direct use of tty buffer work
  tty: Fix tty_send_xchar() lock order inversion
parents 7f217393 bd63acf9

drivers/tty/n_tty.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static inline int tty_copy_to_user(struct tty_struct *tty, 
{

	struct n_tty_data *ldata = tty->disc_data;



	tty_audit_add_data(tty, to, n, ldata->icanon);

	tty_audit_add_data(tty, from, n, ldata->icanon);

	return copy_to_user(to, from, n);

}

drivers/tty/serial/8250/8250_fsl.c

+1 −0
Original line number Diff line number Diff line
@@ -60,3 +60,4 @@ int fsl8250_handle_irq(struct uart_port *port) 
	spin_unlock_irqrestore(&up->port.lock, flags);

	return 1;

}

EXPORT_SYMBOL_GPL(fsl8250_handle_irq);

drivers/tty/serial/8250/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ config SERIAL_8250_MID 
	depends on SERIAL_8250 && PCI

	select HSU_DMA if SERIAL_8250_DMA

	select HSU_DMA_PCI if X86_INTEL_MID

	select RATIONAL

	help

	  Selecting this option will enable handling of the extra features

	  present on the UART found on Intel Medfield SOC and various other

drivers/tty/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1539,7 +1539,6 @@ config SERIAL_FSL_LPUART 
	tristate "Freescale lpuart serial port support"

	depends on HAS_DMA

	select SERIAL_CORE

	select SERIAL_EARLYCON

	help

	  Support for the on-chip lpuart on some Freescale SOCs.
@@ -1547,6 +1546,7 @@ config SERIAL_FSL_LPUART_CONSOLE 
	bool "Console on Freescale lpuart serial port"

	depends on SERIAL_FSL_LPUART=y

	select SERIAL_CORE_CONSOLE

	select SERIAL_EARLYCON

	help

	  If you have enabled the lpuart serial port on the Freescale SoCs,

	  you can make it the console by answering Y to this option.

drivers/tty/serial/bcm63xx_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int bcm_uart_startup(struct uart_port *port) 


	/* register irq and enable rx interrupts */

	ret = request_irq(port->irq, bcm_uart_interrupt, 0,

			  bcm_uart_type(port), port);

			  dev_name(port->dev), port);

	if (ret)

		return ret;

	bcm_uart_writel(port, UART_RX_INT_MASK, UART_IR_REG);