Commit 7dc59dc9 authored Aug 10, 2015 by Andy Shevchenko Committed by Rafael J. Wysocki Aug 26, 2015

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>

parent 4f73b065

drivers/acpi/property.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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);