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

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

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

Pull tty/serial fixes from Greg KH:
 "Here are two fixes that resolve reported issues, one with the 8250
  driver, and the other with the generic fbcon driver.

  Both have been in linux-next for a while"

* tag 'tty-4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  fbcon: initialize blink interval before calling fb_set_par
  Revert "serial: 8250_dma: don't bother DMA with small transfers"
parents 4ee8019d f235f664

drivers/tty/serial/8250/8250_dma.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -80,10 +80,6 @@ int serial8250_tx_dma(struct uart_8250_port *p) 
		return 0;

		return 0;





	dma->tx_size = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE);

	dma->tx_size = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE);

	if (dma->tx_size < p->port.fifosize) {

		ret = -EINVAL;

		goto err;

	}





	desc = dmaengine_prep_slave_single(dma->txchan,

	desc = dmaengine_prep_slave_single(dma->txchan,

					   dma->tx_addr + xmit->tail,

					   dma->tx_addr + xmit->tail,

drivers/video/console/fbcon.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1093,6 +1093,7 @@ static void fbcon_init(struct vc_data *vc, int init) 
		con_copy_unimap(vc, svc);

		con_copy_unimap(vc, svc);





	ops = info->fbcon_par;

	ops = info->fbcon_par;

	ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);

	p->con_rotate = initial_rotation;

	p->con_rotate = initial_rotation;

	set_blitting_type(vc, info);

	set_blitting_type(vc, info);