[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

Signed-off-by: Len Brown <len.brown@intel.com>

7 files changed, 42 insertions, 15 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index ba13896cae40..66c60982ba46 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -154,12 +154,10 @@ config ACPI_PROCESSOR
           support it.
 
 config ACPI_HOTPLUG_CPU
-        bool "Processor Hotplug (EXPERIMENTAL)"
-        depends on ACPI_PROCESSOR && HOTPLUG_CPU && EXPERIMENTAL
+        bool
+        depends on ACPI_PROCESSOR && HOTPLUG_CPU
         select ACPI_CONTAINER
-        default n
-         ---help---
-         Select this option if your platform support physical CPU hotplug.
+        default y
 
 config ACPI_THERMAL
         tristate "Thermal Zone"
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index bb973d2109a1..c885300579ec 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -424,6 +424,7 @@ acpi_pci_irq_enable (
         int                     edge_level = ACPI_LEVEL_SENSITIVE;
         int                     active_high_low = ACPI_ACTIVE_LOW;
         char                    *link = NULL;
+        int                     rc;
 
         ACPI_FUNCTION_TRACE("acpi_pci_irq_enable");
 
@@ -476,7 +477,13 @@ acpi_pci_irq_enable (
                 }
         }
 
-        dev->irq = acpi_register_gsi(irq, edge_level, active_high_low);
+        rc = acpi_register_gsi(irq, edge_level, active_high_low);
+        if (rc < 0) {
+                printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: failed "
+                       "to register GSI\n", pci_name(dev), ('A' + pin));
+                return_VALUE(rc);
+        }
+        dev->irq = rc;
 
         printk(KERN_INFO PREFIX "PCI Interrupt %s[%c] -> ",
                 pci_name(dev), 'A' + pin);
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 834c2ceff1aa..26aa3829f1de 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -804,8 +804,7 @@ acpi_pci_link_resume(
  */
 int acpi_in_resume;
 static int
-irqrouter_resume(
-        struct sys_device *dev)
+irqrouter_resume(struct sys_device *dev)
 {
         struct list_head        *node = NULL;
         struct acpi_pci_link    *link = NULL;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 2cf264fd52e0..7b10a7b070c9 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1665,6 +1665,7 @@ static int
 acpi_video_bus_put_one_device(
         struct acpi_video_device        *device)
 {
+        acpi_status status;
         struct acpi_video_bus *video;
 
         ACPI_FUNCTION_TRACE("acpi_video_bus_put_one_device");
@@ -1679,6 +1680,12 @@ acpi_video_bus_put_one_device(
         up(&video->sem);
         acpi_video_device_remove_fs(device->dev);
 
+        status = acpi_remove_notify_handler(device->handle,
+                ACPI_DEVICE_NOTIFY, acpi_video_device_notify);
+        if (ACPI_FAILURE(status))
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                        "Error removing notify handler\n"));
+
         return_VALUE(0);
 }
 
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 762fa430fb5b..97feb7f7024d 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -906,11 +906,15 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                 if (irqp->number_of_interrupts > 0) {
                         hdp->hd_nirqs = irqp->number_of_interrupts;
 
-                        for (i = 0; i < hdp->hd_nirqs; i++)
-                                hdp->hd_irq[i] =
+                        for (i = 0; i < hdp->hd_nirqs; i++) {
+                                int rc =
                                     acpi_register_gsi(irqp->interrupts[i],
                                                       irqp->edge_level,
                                                       irqp->active_high_low);
+                                if (rc < 0)
+                                        return AE_ERROR;
+                                hdp->hd_irq[i] = rc;
+                        }
                 }
         }
 
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 75575f6c349c..1e296cbef004 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -81,7 +81,7 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, int irq)
                 i++;
         if (i < PNP_MAX_IRQ) {
                 res->irq_resource[i].flags = IORESOURCE_IRQ;  //Also clears _UNSET flag
-                if (irq == -1) {
+                if (irq < 0) {
                         res->irq_resource[i].flags |= IORESOURCE_DISABLED;
                         return;
                 }
diff --git a/drivers/serial/8250_acpi.c b/drivers/serial/8250_acpi.c
index 6b9ead288517..a802bdce6e5d 100644
--- a/drivers/serial/8250_acpi.c
+++ b/drivers/serial/8250_acpi.c
@@ -47,18 +47,30 @@ static acpi_status acpi_serial_port(struct uart_port *port,
 static acpi_status acpi_serial_ext_irq(struct uart_port *port,
                                        struct acpi_resource_ext_irq *ext_irq)
 {
-        if (ext_irq->number_of_interrupts > 0)
-                port->irq = acpi_register_gsi(ext_irq->interrupts[0],
+        int rc;
+
+        if (ext_irq->number_of_interrupts > 0) {
+                rc = acpi_register_gsi(ext_irq->interrupts[0],
                            ext_irq->edge_level, ext_irq->active_high_low);
+                if (rc < 0)
+                        return AE_ERROR;
+                port->irq = rc;
+        }
         return AE_OK;
 }
 
 static acpi_status acpi_serial_irq(struct uart_port *port,
                                    struct acpi_resource_irq *irq)
 {
-        if (irq->number_of_interrupts > 0)
-                port->irq = acpi_register_gsi(irq->interrupts[0],
+        int rc;
+
+        if (irq->number_of_interrupts > 0) {
+                rc = acpi_register_gsi(irq->interrupts[0],
                            irq->edge_level, irq->active_high_low);
+                if (rc < 0)
+                        return AE_ERROR;
+                port->irq = rc;
+        }
         return AE_OK;
 }