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

Commit c12f9ea2 authored by Sean Young's avatar Sean Young Committed by Greg Kroah-Hartman
Browse files

Revert "tty/8250_pnp: serial port detection regression since v3.7" 

This reverts commit 77e372a3.

Checking for disabled resources board breaks detection pnp on another
board "AMI UEFI implementation (Version: 0406 Release Date: 06/06/2012)".
I'm working with the reporter of the original bug to write and test
a better fix.

https://bugzilla.redhat.com/show_bug.cgi?id=928246



Signed-off-by: default avatarSean Young <sean@mess.org>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f663966

drivers/tty/serial/8250/8250_pnp.c

+5 −7
Original line number Diff line number Diff line
@@ -429,7 +429,6 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
{

	struct uart_8250_port uart;

	int ret, line, flags = dev_id->driver_data;

	struct resource *res = NULL;



	if (flags & UNKNOWN_DEV) {

		ret = serial_pnp_guess_board(dev);
@@ -440,12 +439,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) 
	memset(&uart, 0, sizeof(uart));

	if (pnp_irq_valid(dev, 0))

		uart.port.irq = pnp_irq(dev, 0);

	if ((flags & CIR_PORT) && pnp_port_valid(dev, 2))

		res = pnp_get_resource(dev, IORESOURCE_IO, 2);

	else if (pnp_port_valid(dev, 0))

		res = pnp_get_resource(dev, IORESOURCE_IO, 0);

	if (pnp_resource_enabled(res)) {

		uart.port.iobase = res->start;

	if ((flags & CIR_PORT) && pnp_port_valid(dev, 2)) {

		uart.port.iobase = pnp_port_start(dev, 2);

		uart.port.iotype = UPIO_PORT;

	} else if (pnp_port_valid(dev, 0)) {

		uart.port.iobase = pnp_port_start(dev, 0);

		uart.port.iotype = UPIO_PORT;

	} else if (pnp_mem_valid(dev, 0)) {

		uart.port.mapbase = pnp_mem_start(dev, 0);