device property: attach 'else if' to the proper 'if'
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 10 Aug 2015 16:56:48 +0000 (19:56 +0300)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 25 Aug 2015 23:46:39 +0000 (01:46 +0200)
Obviously in the current place the 'else' keyword is redundant, though it seems
quite correct when we check if nval is in allowed range.

Reattach the condition branch there.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/property.c

index 7836e2e..6d99450 100644 (file)
@@ -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);