Merge tag 'v4.3-rc1' into MTD -next development

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / property.c

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index 7836e2e980f41943010825429f0c0c42a575362c..6d99450549c59dc1990598a0ad801049bc241b03 100644 (file)
--- 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);