Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e337c72 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Fix several incorrect invocations of ACPICA return macro 

ACPICA commit 521bedc49b42e59116de1b54dcd95d30d36cac90

Not needed since there is no function tracing for the
validation function in hwvalid.c

Link: https://github.com/acpica/acpica/commit/521bedc4


Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1b8f77aa

drivers/acpi/acpica/hwvalid.c

+4 −4
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) 
	if ((bit_width != 8) && (bit_width != 16) && (bit_width != 32)) {

		ACPI_ERROR((AE_INFO,

			    "Bad BitWidth parameter: %8.8X", bit_width));

		return_ACPI_STATUS(AE_BAD_PARAMETER);

		return (AE_BAD_PARAMETER);

	}



	port_info = acpi_protected_ports;
@@ -153,13 +153,13 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) 
		ACPI_ERROR((AE_INFO,

			    "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",

			    ACPI_FORMAT_UINT64(address), byte_width));

		return_ACPI_STATUS(AE_LIMIT);

		return (AE_LIMIT);

	}



	/* Exit if requested address is not within the protected port table */



	if (address > acpi_protected_ports[ACPI_PORT_INFO_ENTRIES - 1].end) {

		return_ACPI_STATUS(AE_OK);

		return (AE_OK);

	}



	/* Check request against the list of protected I/O ports */
@@ -198,7 +198,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) 
		}

	}



	return_ACPI_STATUS(AE_OK);

	return (AE_OK);

}



/******************************************************************************