7ef4087f99
We have a better idea why the Yoga patches are affecting one touchpad. Bring them back so everyone can benefit from Yoga.
66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
From 3c60f1149a2fee9ac4ef3cc27bd830e3bd8d2654 Mon Sep 17 00:00:00 2001
|
|
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Date: Mon, 30 Nov 2015 17:11:35 +0200
|
|
Subject: [PATCH 07/16] device property: return -EINVAL when property isn't
|
|
found in ACPI
|
|
|
|
Change return code to be in align with OF and built-in device properties error
|
|
codes. In particular -EINVAL means property is not found.
|
|
|
|
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
|
---
|
|
drivers/acpi/property.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
|
|
index 88f4306..2aee416 100644
|
|
--- a/drivers/acpi/property.c
|
|
+++ b/drivers/acpi/property.c
|
|
@@ -346,7 +346,7 @@ void acpi_free_properties(struct acpi_device *adev)
|
|
*
|
|
* Return: %0 if property with @name has been found (success),
|
|
* %-EINVAL if the arguments are invalid,
|
|
- * %-ENODATA if the property doesn't exist,
|
|
+ * %-EINVAL if the property doesn't exist,
|
|
* %-EPROTO if the property value type doesn't match @type.
|
|
*/
|
|
static int acpi_data_get_property(struct acpi_device_data *data,
|
|
@@ -360,7 +360,7 @@ static int acpi_data_get_property(struct acpi_device_data *data,
|
|
return -EINVAL;
|
|
|
|
if (!data->pointer || !data->properties)
|
|
- return -ENODATA;
|
|
+ return -EINVAL;
|
|
|
|
properties = data->properties;
|
|
for (i = 0; i < properties->package.count; i++) {
|
|
@@ -375,13 +375,13 @@ static int acpi_data_get_property(struct acpi_device_data *data,
|
|
if (!strcmp(name, propname->string.pointer)) {
|
|
if (type != ACPI_TYPE_ANY && propvalue->type != type)
|
|
return -EPROTO;
|
|
- else if (obj)
|
|
+ if (obj)
|
|
*obj = propvalue;
|
|
|
|
return 0;
|
|
}
|
|
}
|
|
- return -ENODATA;
|
|
+ return -EINVAL;
|
|
}
|
|
|
|
/**
|
|
@@ -439,7 +439,7 @@ int acpi_node_prop_get(struct fwnode_handle *fwnode, const char *propname,
|
|
*
|
|
* Return: %0 if array property (package) with @name has been found (success),
|
|
* %-EINVAL if the arguments are invalid,
|
|
- * %-ENODATA if the property doesn't exist,
|
|
+ * %-EINVAL if the property doesn't exist,
|
|
* %-EPROTO if the property is not a package or the type of its elements
|
|
* doesn't match @type.
|
|
*/
|
|
--
|
|
2.5.0
|
|
|