3.8-stable patches

added patches:
	revert-tty-8250_pnp-serial-port-detection-regression-since-v3.7.patch

diff --git a/queue-3.8/revert-tty-8250_pnp-serial-port-detection-regression-since-v3.7.patch b/queue-3.8/revert-tty-8250_pnp-serial-port-detection-regression-since-v3.7.patch
new file mode 100644 (file)
index 0000000..8159e9a
--- /dev/null
+++ b/queue-3.8/revert-tty-8250_pnp-serial-port-detection-regression-since-v3.7.patch
@@ -0,0 +1,53 @@
+From c12f9ea28e9fbe7b1f4cefc953bee33298370683 Mon Sep 17 00:00:00 2001
+From: Sean Young <sean@mess.org>
+Date: Sun, 7 Apr 2013 20:47:18 +0100
+Subject: Revert "tty/8250_pnp: serial port detection regression since v3.7"
+
+From: Sean Young <sean@mess.org>
+
+commit c12f9ea28e9fbe7b1f4cefc953bee33298370683 upstream.
+
+This reverts commit 77e372a3d82e5e4878ce1962207edd766773cc76.
+
+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: Sean Young <sean@mess.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/serial/8250/8250_pnp.c |   12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+--- a/drivers/tty/serial/8250/8250_pnp.c
++++ b/drivers/tty/serial/8250/8250_pnp.c
+@@ -429,7 +429,6 @@ serial_pnp_probe(struct pnp_dev *dev, co
+ {
+       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, co
+       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);

diff --git a/queue-3.8/series b/queue-3.8/series
index 303ca83376f48c068647341d4f8b20c1c6bfee5d..d2a842bbd9d6a3c7dc141d935eebf73b0b47d8cb 100644 (file)
--- a/queue-3.8/series
+++ b/queue-3.8/series
@@ -62,3 +62,4 @@ nfsv4-doh-typo-in-the-fix-to-nfs41_walk_client_list.patch
 can-gw-use-kmem_cache_free-instead-of-kfree.patch
 mwifiex-complete-last-internal-scan.patch
 rt2x00-rt2x00pci_regbusy_read-only-print-register-access-failure-once.patch
+revert-tty-8250_pnp-serial-port-detection-regression-since-v3.7.patch