浏览代码

ACPI / PM: Do not refcount power resources that can't be turned on

If turning on a power resource fails, do not reference count it,
since it cannot be in use in that case.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Rafael J. Wysocki 14 年之前
父节点
当前提交
12b3b5afed
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      drivers/acpi/power.c

+ 3 - 1
drivers/acpi/power.c

@@ -213,11 +213,13 @@ static int acpi_power_on(acpi_handle handle)
 				  resource->name));
 				  resource->name));
 	} else {
 	} else {
 		result = __acpi_power_on(resource);
 		result = __acpi_power_on(resource);
+		if (result)
+			resource->ref_count--;
 	}
 	}
 
 
 	mutex_unlock(&resource->resource_lock);
 	mutex_unlock(&resource->resource_lock);
 
 
-	return 0;
+	return result;
 }
 }
 
 
 static int acpi_power_off_device(acpi_handle handle)
 static int acpi_power_off_device(acpi_handle handle)