net: stmmac: xgmac: Fix RSS writing wrong keys

[linux-2.6-block.git] / drivers / acpi / thermal.c

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 00f12a86ecbd42fc5ca401bef64b2a03d8249c7f..d831a61e0010eaf69dd16c96f0983315cf0a0972 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -225,13 +225,9 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
        if (!tz)
                return -EINVAL;
 
-       if (!acpi_has_method(tz->device->handle, "_SCP")) {
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "_SCP not present\n"));
+       if (ACPI_FAILURE(acpi_execute_simple_method(tz->device->handle,
+                                                   "_SCP", mode)))
                return -ENODEV;
-       } else if (ACPI_FAILURE(acpi_execute_simple_method(tz->device->handle,
-                                                          "_SCP", mode))) {
-               return -ENODEV;
-       }
 
        return 0;
 }
@@ -463,8 +459,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                        break;
        }
 
-       if ((flag & ACPI_TRIPS_DEVICES)
-           && acpi_has_method(tz->device->handle, "_TZD")) {
+       if (flag & ACPI_TRIPS_DEVICES) {
                memset(&devices, 0, sizeof(devices));
                status = acpi_evaluate_reference(tz->device->handle, "_TZD",
                                                NULL, &devices);