2 files changed, 17 insertions, 3 deletions

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index c4a769d1ba85..f6215e809808 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -194,6 +194,9 @@ static int acpi_battery_get_property(struct power_supply *psy,
         case POWER_SUPPLY_PROP_MANUFACTURER:
                 val->strval = battery->oem_info;
                 break;
+        case POWER_SUPPLY_PROP_SERIAL_NUMBER:
+                val->strval = battery->serial_number;
+                break;
         default:
                 return -EINVAL;
         }
@@ -212,6 +215,7 @@ static enum power_supply_property charge_battery_props[] = {
         POWER_SUPPLY_PROP_CHARGE_NOW,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
+        POWER_SUPPLY_PROP_SERIAL_NUMBER,
 };
 
 static enum power_supply_property energy_battery_props[] = {
@@ -226,6 +230,7 @@ static enum power_supply_property energy_battery_props[] = {
         POWER_SUPPLY_PROP_ENERGY_NOW,
         POWER_SUPPLY_PROP_MODEL_NAME,
         POWER_SUPPLY_PROP_MANUFACTURER,
+        POWER_SUPPLY_PROP_SERIAL_NUMBER,
 };
 #endif
 
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 485de1347075..7f97e32fc33f 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -472,11 +472,20 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p)
         if (acpi_target_sleep_state == ACPI_STATE_S0 ||
             (wake && adev->wakeup.state.enabled &&
              adev->wakeup.sleep_state <= acpi_target_sleep_state)) {
+                acpi_status status;
+
                 acpi_method[3] = 'W';
-                acpi_evaluate_integer(handle, acpi_method, NULL, &d_max);
-                /* Sanity check */
-                if (d_max < d_min)
+                status = acpi_evaluate_integer(handle, acpi_method, NULL,
+                                                &d_max);
+                if (ACPI_FAILURE(status)) {
+                        d_max = d_min;
+                } else if (d_max < d_min) {
+                        /* Warn the user of the broken DSDT */
+                        printk(KERN_WARNING "ACPI: Wrong value from %s\n",
+                                acpi_method);
+                        /* Sanitize it */
                         d_min = d_max;
+                }
         }
 
         if (d_min_p)