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

Commit 5a22e30d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'tty-3.3-rc3' tty-next 



This is needed to handle the 8250 file merge mess properly for future
patches.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 19e00f2f 418a936e

Documentation/devicetree/bindings/tty/serial/efm32-uart.txt

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
* Energymicro efm32 UART



Required properties:

- compatible : Should be "efm32,uart"

- reg : Address and length of the register set

- interrupts : Should contain uart interrupt



Example:



uart@0x4000c400 {

	compatible = "efm32,uart";

	reg = <0x4000c400 0x400>;

	interrupts = <15>;

};

drivers/isdn/capi/capi.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -1015,14 +1015,11 @@ capinc_tty_install(struct tty_driver *driver, struct tty_struct *tty) 
{

{

	int idx = tty->index;

	int idx = tty->index;

	struct capiminor *mp = capiminor_get(idx);

	struct capiminor *mp = capiminor_get(idx);

	int ret = tty_init_termios(tty);

	int ret = tty_standard_install(driver, tty);





	if (ret == 0) {

	if (ret == 0)

		tty_driver_kref_get(driver);

		tty->count++;

		tty->driver_data = mp;

		tty->driver_data = mp;

		driver->ttys[idx] = tty;

	else

	} else

		capiminor_put(mp);

		capiminor_put(mp);

	return ret;

	return ret;

}

}

drivers/misc/pti.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -481,13 +481,9 @@ static int pti_tty_install(struct tty_driver *driver, struct tty_struct *tty) 
{

{

	int idx = tty->index;

	int idx = tty->index;

	struct pti_tty *pti_tty_data;

	struct pti_tty *pti_tty_data;

	int ret = tty_init_termios(tty);

	int ret = tty_standard_install(driver, tty);





	if (ret == 0) {

	if (ret == 0) {

		tty_driver_kref_get(driver);

		tty->count++;

		driver->ttys[idx] = tty;



		pti_tty_data = kmalloc(sizeof(struct pti_tty), GFP_KERNEL);

		pti_tty_data = kmalloc(sizeof(struct pti_tty), GFP_KERNEL);

		if (pti_tty_data == NULL)

		if (pti_tty_data == NULL)

			return -ENOMEM;

			return -ENOMEM;

drivers/mmc/card/sdio_uart.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -750,15 +750,12 @@ static int sdio_uart_install(struct tty_driver *driver, struct tty_struct *tty) 
{

{

	int idx = tty->index;

	int idx = tty->index;

	struct sdio_uart_port *port = sdio_uart_port_get(idx);

	struct sdio_uart_port *port = sdio_uart_port_get(idx);

	int ret = tty_init_termios(tty);

	int ret = tty_standard_install(driver, tty);





	if (ret == 0) {

	if (ret == 0)

		tty_driver_kref_get(driver);

		tty->count++;

		/* This is the ref sdio_uart_port get provided */

		/* This is the ref sdio_uart_port get provided */

		tty->driver_data = port;

		tty->driver_data = port;

		driver->ttys[idx] = tty;

	else

	} else

		sdio_uart_port_put(port);

		sdio_uart_port_put(port);

	return ret;

	return ret;

}

}

drivers/tty/hvc/hvc_beat.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ static int __init hvc_beat_init(void) 
	if (!firmware_has_feature(FW_FEATURE_BEAT))

	if (!firmware_has_feature(FW_FEATURE_BEAT))

		return -ENODEV;

		return -ENODEV;





	hp = hvc_alloc(0, NO_IRQ, &hvc_beat_get_put_ops, 16);

	hp = hvc_alloc(0, 0, &hvc_beat_get_put_ops, 16);

	if (IS_ERR(hp))

	if (IS_ERR(hp))

		return PTR_ERR(hp);

		return PTR_ERR(hp);

	hvc_beat_dev = hp;

	hvc_beat_dev = hp;