4 files changed, 67 insertions, 10 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 7c49e103cf8f..4a3220b218d8 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -243,6 +243,17 @@ config ACPI_IBM_DOCK
 
           If you are not sure, say N here.
 
+config ACPI_IBM_BAY
+        bool "Legacy Removable Bay Support"
+        depends on ACPI_IBM
+        default y
+        ---help---
+          Allows the ibm_acpi driver to handle removable bays.  It will allow
+          disabling the device in the bay, and also generate notifications when
+          the bay lever is ejected or inserted.
+
+          If you are not sure, say Y here.
+
 config ACPI_TOSHIBA
         tristate "Toshiba Laptop Extras"
         depends on X86
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 4cc534e36e81..36901362fd24 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -86,6 +86,7 @@
 
 #include <linux/proc_fs.h>
 #include <linux/backlight.h>
+#include <linux/fb.h>
 #include <asm/uaccess.h>
 
 #include <linux/dmi.h>
@@ -157,6 +158,7 @@ IBM_HANDLE(dock, root, "\\_SB.GDCK",	/* X30, X31, X40 */
            "\\_SB.PCI.ISA.SLCE",        /* 570 */
     );                          /* A21e,G4x,R30,R31,R32,R40,R40e,R50e */
 #endif
+#ifdef CONFIG_ACPI_IBM_BAY
 IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST",        /* 570 */
            "\\_SB.PCI0.IDE0.IDES.IDSM", /* 600e/x, 770e, 770x */
            "\\_SB.PCI0.SATA.SCND.MSTR", /* T60, X60, Z60 */ 
@@ -174,6 +176,7 @@ IBM_HANDLE(bay2, root, "\\_SB.PCI0.IDE0.PRIM.SLAV",	/* A3x, R32 */
 IBM_HANDLE(bay2_ej, bay2, "_EJ3",       /* 600e/x, 770e, A3x */
            "_EJ0",              /* 770x */
     );                          /* all others */
+#endif /* CONFIG_ACPI_IBM_BAY */
 
 /* don't list other alternatives as we install a notify handler on the 570 */
 IBM_HANDLE(pci, root, "\\_SB.PCI");     /* 570 */
@@ -1044,6 +1047,7 @@ static int light_write(char *buf)
         return 0;
 }
 
+#if defined(CONFIG_ACPI_IBM_DOCK) || defined(CONFIG_ACPI_IBM_BAY)
 static int _sta(acpi_handle handle)
 {
         int status;
@@ -1053,6 +1057,7 @@ static int _sta(acpi_handle handle)
 
         return status;
 }
+#endif
 
 #ifdef CONFIG_ACPI_IBM_DOCK
 #define dock_docked() (_sta(dock_handle) & 1)
@@ -1119,6 +1124,7 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
 }
 #endif
 
+#ifdef CONFIG_ACPI_IBM_BAY
 static int bay_status_supported;
 static int bay_status2_supported;
 static int bay_eject_supported;
@@ -1194,6 +1200,7 @@ static void bay_notify(struct ibm_struct *ibm, u32 event)
 {
         acpi_bus_generate_event(ibm->device, event, 0);
 }
+#endif /* CONFIG_ACPI_IBM_BAY */
 
 static int cmos_read(char *p)
 {
@@ -1701,7 +1708,10 @@ static int brightness_write(char *buf)
 
 static int brightness_update_status(struct backlight_device *bd)
 {
-        return brightness_set(bd->props.brightness);
+        return brightness_set(
+                (bd->props.fb_blank == FB_BLANK_UNBLANK &&
+                 bd->props.power == FB_BLANK_UNBLANK) ?
+                                bd->props.brightness : 0);
 }
 
 static struct backlight_ops ibm_backlight_data = {
@@ -1711,6 +1721,12 @@ static struct backlight_ops ibm_backlight_data = {
 
 static int brightness_init(void)
 {
+        int b;
+
+        b = brightness_get(NULL);
+        if (b < 0)
+                return b;
+
         ibm_backlight_device = backlight_device_register("ibm", NULL, NULL,
                                                          &ibm_backlight_data);
         if (IS_ERR(ibm_backlight_device)) {
@@ -1718,7 +1734,9 @@ static int brightness_init(void)
                 return PTR_ERR(ibm_backlight_device);
         }
 
-        ibm_backlight_device->props.max_brightness = 7;
+        ibm_backlight_device->props.max_brightness = 7;
+        ibm_backlight_device->props.brightness = b;
+        backlight_update_status(ibm_backlight_device);
 
         return 0;
 }
@@ -2353,6 +2371,7 @@ static struct ibm_struct ibms[] = {
          .type = ACPI_SYSTEM_NOTIFY,
          },
 #endif
+#ifdef CONFIG_ACPI_IBM_BAY
         {
          .name = "bay",
          .init = bay_init,
@@ -2362,6 +2381,7 @@ static struct ibm_struct ibms[] = {
          .handle = &bay_handle,
          .type = ACPI_SYSTEM_NOTIFY,
          },
+#endif /* CONFIG_ACPI_IBM_BAY */
         {
          .name = "cmos",
          .read = cmos_read,
@@ -2647,7 +2667,9 @@ IBM_PARAM(light);
 #ifdef CONFIG_ACPI_IBM_DOCK
 IBM_PARAM(dock);
 #endif
+#ifdef CONFIG_ACPI_IBM_BAY
 IBM_PARAM(bay);
+#endif /* CONFIG_ACPI_IBM_BAY */
 IBM_PARAM(cmos);
 IBM_PARAM(led);
 IBM_PARAM(beep);
@@ -2723,12 +2745,14 @@ static int __init acpi_ibm_init(void)
         IBM_HANDLE_INIT(dock);
 #endif
         IBM_HANDLE_INIT(pci);
+#ifdef CONFIG_ACPI_IBM_BAY
         IBM_HANDLE_INIT(bay);
         if (bay_handle)
                 IBM_HANDLE_INIT(bay_ej);
         IBM_HANDLE_INIT(bay2);
         if (bay2_handle)
                 IBM_HANDLE_INIT(bay2_ej);
+#endif /* CONFIG_ACPI_IBM_BAY */
         IBM_HANDLE_INIT(beep);
         IBM_HANDLE_INIT(ecrd);
         IBM_HANDLE_INIT(ecwr);
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 1ef338545dfe..547eee7537bc 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -436,8 +436,6 @@ int acpi_power_transition(struct acpi_device *device, int state)
         cl = &device->power.states[device->power.state].resources;
         tl = &device->power.states[state].resources;
 
-        device->power.state = ACPI_STATE_UNKNOWN;
-
         if (!cl->count && !tl->count) {
                 result = -ENODEV;
                 goto end;
@@ -468,12 +466,15 @@ int acpi_power_transition(struct acpi_device *device, int state)
                         goto end;
         }
 
-        /* We shouldn't change the state till all above operations succeed */
-        device->power.state = state;
-      end:
-        if (result)
+     end:
+        if (result) {
+                device->power.state = ACPI_STATE_UNKNOWN;
                 printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n",
                               device->pnp.bus_id, state);
+        } else {
+        /* We shouldn't change the state till all above operations succeed */
+                device->power.state = state;
+        }
 
         return result;
 }
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index 1358c06a969c..cc48ab05676c 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -191,6 +191,9 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
         user_prt = ACPI_CAST_PTR(struct acpi_pci_routing_table, buffer);
 
         for (index = 0; index < number_of_elements; index++) {
+                int source_name_index = 2;
+                int source_index_index = 3;
+
                 /*
                  * Point user_prt past this current structure
                  *
@@ -261,10 +264,28 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                 }
 
                 /*
+                 * If BIOS erroneously reversed the _PRT source_name and source_index,
+                 * then reverse them back.
+                 */
+                if (ACPI_GET_OBJECT_TYPE (sub_object_list[3]) != ACPI_TYPE_INTEGER) {
+                        if (acpi_gbl_enable_interpreter_slack) {
+                                source_name_index = 3;
+                                source_index_index = 2;
+                                printk(KERN_WARNING "ACPI: Handling Garbled _PRT entry\n");
+                        } else {
+                                ACPI_ERROR((AE_INFO,
+                                        "(PRT[%X].source_index) Need Integer, found %s",
+                                        index,
+                                        acpi_ut_get_object_type_name(sub_object_list[3])));
+                                return_ACPI_STATUS(AE_BAD_DATA);
+                        }
+                }
+
+                /*
                  * 3) Third subobject: Dereference the PRT.source_name
                  * The name may be unresolved (slack mode), so allow a null object
                  */
-                obj_desc = sub_object_list[2];
+                obj_desc = sub_object_list[source_name_index];
                 if (obj_desc) {
                         switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
                         case ACPI_TYPE_LOCAL_REFERENCE:
@@ -339,7 +360,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
 
                 /* 4) Fourth subobject: Dereference the PRT.source_index */
 
-                obj_desc = sub_object_list[3];
+                obj_desc = sub_object_list[source_index_index];
                 if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
                         user_prt->source_index = (u32) obj_desc->integer.value;
                 } else {