summaryrefslogtreecommitdiff
path: root/drivers/acpi/property.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2015-08-10 19:56:48 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-08-26 01:46:39 +0200
commit7dc59dc938f034c69dcf9080d45b936882b7ffa3 (patch)
treea82536b4ff65d2426a0249adaafbb3754fbe9f34 /drivers/acpi/property.c
parent4f73b0654d8a954540d49bb0a300f31663423db9 (diff)
downloadlinux-sh-7dc59dc938f034c69dcf9080d45b936882b7ffa3.tar.gz
device property: attach 'else if' to the proper 'if'
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>
Diffstat (limited to 'drivers/acpi/property.c')
-rw-r--r--drivers/acpi/property.c5
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);