Commit 2ad48ee8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull serial fixes from Greg KH:
 "Here are tiny and assorted serial driver fixes that have been in a
  branch in my tree for a while and somehow did not get properly merged
  into my big TTY / Serial pull request for 3.14-rc1.  Sorry about that.

  All have been in linux-next for a while with no issues"

* tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: xuartps: Properly guard sysrq specific code
  serial: 8250: Fix initialisation of Quatech cards with the AMCC PCI chip
  serial: icom: dereference after free in load_code()
  serial: 8250_dw: add new ACPI IDs
  tty: serial: pch: don't crash if DMA enabled but not loaded
  serial: samsung: move clock deactivation below uart registration
parents d30492ad 4fbd269f

drivers/tty/serial/icom.c

+2 −2
Original line number Diff line number Diff line
@@ -455,11 +455,11 @@ static void load_code(struct icom_port *icom_port) 
	for (index = 0; index < fw->size; index++)

		new_page[index] = fw->data[index];



	release_firmware(fw);



	writeb((char) ((fw->size + 16)/16), &icom_port->dram->mac_length);

	writel(temp_pci, &icom_port->dram->mac_load_addr);



	release_firmware(fw);



	/*Setting the syncReg to 0x80 causes adapter to start downloading

	   the personality code into adapter instruction RAM.

	   Once code is loaded, it will begin executing and, based on

drivers/tty/serial/pch_uart.c

+7 −3
Original line number Diff line number Diff line
@@ -1508,11 +1508,15 @@ static int pch_uart_verify_port(struct uart_port *port, 
			__func__);

		return -EOPNOTSUPP;

#endif

		dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");

		if (!priv->use_dma)

		if (!priv->use_dma) {

			pch_request_dma(port);

			if (priv->chan_rx)

				priv->use_dma = 1;

		}

		dev_info(priv->port.dev, "PCH UART: %s\n",

				priv->use_dma ?

				"Use DMA Mode" : "No DMA");

	}



	return 0;

}

drivers/tty/serial/samsung.c

+7 −1
Original line number Diff line number Diff line
@@ -1209,7 +1209,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport, 


	/* reset the fifos (and setup the uart) */

	s3c24xx_serial_resetport(port, cfg);

	clk_disable_unprepare(ourport->clk);

	return 0;

}
@@ -1287,6 +1286,13 @@ static int s3c24xx_serial_probe(struct platform_device *pdev) 
	uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);

	platform_set_drvdata(pdev, &ourport->port);



	/*

	 * Deactivate the clock enabled in s3c24xx_serial_init_port here,

	 * so that a potential re-enablement through the pm-callback overlaps

	 * and keeps the clock enabled in this case.

	 */

	clk_disable_unprepare(ourport->clk);



#ifdef CONFIG_SAMSUNG_CLOCK

	ret = device_create_file(&pdev->dev, &dev_attr_clock_source);

	if (ret < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE