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

Commit 4c40aed8 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Len Brown
Browse files

ACPI, APEI, EINJ Allow empty Trigger Error Action Table 

According to the ACPI spec [1] section 18.6.4 the TRIGGER_ERROR action
table can consists of zero elements.

[1] Advanced Configuration and Power Interface Specification
    Revision 5.0, December 6, 2011
	http://www.acpi.info/DOWNLOADS/ACPIspec50.pdf



Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund@ericsson.com>
Acked-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1001a3a3

drivers/acpi/apei/einj.c

+6 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int einj_check_trigger_header(struct acpi_einj_trigger *trigger_tab) 
	if (trigger_tab->header_size != sizeof(struct acpi_einj_trigger))

		return -EINVAL;

	if (trigger_tab->table_size > PAGE_SIZE ||

	    trigger_tab->table_size <= trigger_tab->header_size)

	    trigger_tab->table_size < trigger_tab->header_size)

		return -EINVAL;

	if (trigger_tab->entry_count !=

	    (trigger_tab->table_size - trigger_tab->header_size) /
@@ -340,6 +340,11 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type, 
			   "The trigger error action table is invalid\n");

		goto out_rel_header;

	}



	/* No action structures in the TRIGGER_ERROR table, nothing to do */

	if (!trigger_tab->entry_count)

		goto out_rel_header;



	rc = -EIO;

	table_size = trigger_tab->table_size;

	r = request_mem_region(trigger_paddr + sizeof(*trigger_tab),