diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-01 03:45:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-01 03:45:05 +0200 |
| commit | 498012511a060575a56551d28a10bb392aa361b5 (patch) | |
| tree | d9dd9060eb6b3037804eca8e22056e7cdb1a26dd /drivers/acpi | |
| parent | 5d2a1a927d487d6bb60c87b837d82702d8ebcaad (diff) | |
| parent | 4bf011815f2e093c7f60004f4f5683cf40b905b9 (diff) | |
| download | linux-498012511a060575a56551d28a10bb392aa361b5.tar.bz2 | |
Merge branch 'device-properties'
* device-properties:
device property: check fwnode type in to_of_node()
device property: attach 'else if' to the proper 'if'
device property: fallback to pset when gettng one string
device property: fix potential NULL pointer dereference
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/property.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index 7836e2e980f4..6d99450549c5 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c @@ -528,13 +528,14 @@ int acpi_dev_prop_read(struct acpi_device *adev, const char *propname, if (!val) return obj->package.count; - else if (nval <= 0) - return -EINVAL; if (nval > obj->package.count) return -EOVERFLOW; + else if (nval <= 0) + return -EINVAL; items = obj->package.elements; + switch (proptype) { case DEV_PROP_U8: ret = acpi_copy_property_array_u8(items, (u8 *)val, nval); |