6 files changed, 30 insertions, 18 deletions

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 897640188acd..c2daa85fc9f7 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -680,13 +680,21 @@ static int acpi_device_wakeup(struct acpi_device *adev, u32 target_state,
                 if (error)
                         return error;
 
+                if (adev->wakeup.flags.enabled)
+                        return 0;
+
                 res = acpi_enable_gpe(wakeup->gpe_device, wakeup->gpe_number);
-                if (ACPI_FAILURE(res)) {
+                if (ACPI_SUCCESS(res)) {
+                        adev->wakeup.flags.enabled = 1;
+                } else {
                         acpi_disable_wakeup_device_power(adev);
                         return -EIO;
                 }
         } else {
-                acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);
+                if (adev->wakeup.flags.enabled) {
+                        acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);
+                        adev->wakeup.flags.enabled = 0;
+                }
                 acpi_disable_wakeup_device_power(adev);
         }
         return 0;
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5f9b74b9b71f..1b5853f384e2 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -844,6 +844,8 @@ static int ec_install_handlers(struct acpi_ec *ec)
 
 static void ec_remove_handlers(struct acpi_ec *ec)
 {
+        if (!test_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags))
+                return;
         acpi_disable_gpe(NULL, ec->gpe);
         if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
                                 ACPI_ADR_SPACE_EC, &acpi_ec_space_handler)))
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index caf9b76b7ef8..7a36f02598a6 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -325,6 +325,7 @@ static int acpi_fan_probe(struct platform_device *pdev)
         struct thermal_cooling_device *cdev;
         struct acpi_fan *fan;
         struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
+        char *name;
 
         fan = devm_kzalloc(&pdev->dev, sizeof(*fan), GFP_KERNEL);
         if (!fan) {
@@ -346,7 +347,12 @@ static int acpi_fan_probe(struct platform_device *pdev)
                 }
         }
 
-        cdev = thermal_cooling_device_register("Fan", device,
+        if (!strncmp(pdev->name, "PNP0C0B", strlen("PNP0C0B")))
+                name = "Fan";
+        else
+                name = acpi_device_bid(device);
+
+        cdev = thermal_cooling_device_register(name, device,
                                                 &fan_cooling_ops);
         if (IS_ERR(cdev)) {
                 result = PTR_ERR(cdev);
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 1b1cf558d3d3..16914cc30882 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2214,7 +2214,7 @@ static void acpi_device_dep_initialize(struct acpi_device *adev)
         status = acpi_evaluate_reference(adev->handle, "_DEP", NULL,
                                         &dep_devices);
         if (ACPI_FAILURE(status)) {
-                dev_err(&adev->dev, "Failed to evaluate _DEP.\n");
+                dev_dbg(&adev->dev, "Failed to evaluate _DEP.\n");
                 return;
         }
 
@@ -2224,7 +2224,7 @@ static void acpi_device_dep_initialize(struct acpi_device *adev)
 
                 status = acpi_get_object_info(dep_devices.handles[i], &info);
                 if (ACPI_FAILURE(status)) {
-                        dev_err(&adev->dev, "Error reading device info\n");
+                        dev_dbg(&adev->dev, "Error reading _DEP device info\n");
                         continue;
                 }
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index dd8ff63ee2b4..cd49a3982b6a 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -346,22 +346,16 @@ acpi_evaluate_reference(acpi_handle handle,
         package = buffer.pointer;
 
         if ((buffer.length == 0) || !package) {
-                printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
-                            (unsigned)buffer.length, package);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
         }
         if (package->type != ACPI_TYPE_PACKAGE) {
-                printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
-                            package->type);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
         }
         if (!package->package.count) {
-                printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
-                            package);
                 status = AE_BAD_DATA;
                 acpi_util_eval_error(handle, pathname, status);
                 goto end;
@@ -380,17 +374,13 @@ acpi_evaluate_reference(acpi_handle handle,
 
                 if (element->type != ACPI_TYPE_LOCAL_REFERENCE) {
                         status = AE_BAD_DATA;
-                        printk(KERN_ERR PREFIX
-                                    "Expecting a [Reference] package element, found type %X\n",
-                                    element->type);
                         acpi_util_eval_error(handle, pathname, status);
                         break;
                 }
 
                 if (!element->reference.handle) {
-                        printk(KERN_WARNING PREFIX "Invalid reference in"
-                               " package %s\n", pathname);
                         status = AE_NULL_ENTRY;
+                        acpi_util_eval_error(handle, pathname, status);
                         break;
                 }
                 /* Get the  acpi_handle. */
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 185a57d13723..1eaadff2e198 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -155,6 +155,7 @@ struct acpi_video_bus {
         u8 dos_setting;
         struct acpi_video_enumerated_device *attached_array;
         u8 attached_count;
+        u8 child_count;
         struct acpi_video_bus_cap cap;
         struct acpi_video_bus_flags flags;
         struct list_head video_device_list;
@@ -1159,8 +1160,12 @@ static bool acpi_video_device_in_dod(struct acpi_video_device *device)
         struct acpi_video_bus *video = device->video;
         int i;
 
-        /* If we have a broken _DOD, no need to test */
-        if (!video->attached_count)
+        /*
+         * If we have a broken _DOD or we have more than 8 output devices
+         * under the graphics controller node that we can't proper deal with
+         * in the operation region code currently, no need to test.
+         */
+        if (!video->attached_count || video->child_count > 8)
                 return true;
 
         for (i = 0; i < video->attached_count; i++) {
@@ -1413,6 +1418,7 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,
                         dev_err(&dev->dev, "Can't attach device\n");
                         break;
                 }
+                video->child_count++;
         }
         return status;
 }