tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull tty/serial fixes from Greg KH:
"Here are three small TTY/Serial/VT fixes for 5.7-rc5:

- revert for the bcm63xx driver "fix" that was incorrect

- vt unicode console bugfix

- xilinx_uartps console driver fix

All of these have been in linux next with no reported issues"

* tag 'tty-5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
tty: xilinx_uartps: Fix missing id assignment to the console
vt: fix unicode console freeing with a common interface
Revert "tty: serial: bcm63xx: fix missing clk_put() in bcm63xx_uart"

Linus Torvalds cbd0e482 0a0b96b2

+9 -5
+1 -3
drivers/tty/serial/bcm63xx_uart.c
··· 843 843 if (IS_ERR(clk) && pdev->dev.of_node) 844 844 clk = of_clk_get(pdev->dev.of_node, 0); 845 845 846 - if (IS_ERR(clk)) { 847 - clk_put(clk); 846 + if (IS_ERR(clk)) 848 847 return -ENODEV; 849 - } 850 848 851 849 port->iotype = UPIO_MEM; 852 850 port->irq = res_irq->start;
+1
drivers/tty/serial/xilinx_uartps.c
··· 1459 1459 cdns_uart_uart_driver.nr = CDNS_UART_NR_PORTS; 1460 1460 #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE 1461 1461 cdns_uart_uart_driver.cons = &cdns_uart_console; 1462 + cdns_uart_console.index = id; 1462 1463 #endif 1463 1464 1464 1465 rc = uart_register_driver(&cdns_uart_uart_driver);
+7 -2
drivers/tty/vt/vt.c
··· 365 365 return uniscr; 366 366 } 367 367 368 + static void vc_uniscr_free(struct uni_screen *uniscr) 369 + { 370 + vfree(uniscr); 371 + } 372 + 368 373 static void vc_uniscr_set(struct vc_data *vc, struct uni_screen *new_uniscr) 369 374 { 370 - vfree(vc->vc_uni_screen); 375 + vc_uniscr_free(vc->vc_uni_screen); 371 376 vc->vc_uni_screen = new_uniscr; 372 377 } 373 378 ··· 1235 1230 err = resize_screen(vc, new_cols, new_rows, user); 1236 1231 if (err) { 1237 1232 kfree(newscreen); 1238 - kfree(new_uniscr); 1233 + vc_uniscr_free(new_uniscr); 1239 1234 return err; 1240 1235 } 1241 1236