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

Commit eab001bf authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'misc' into test

parents 156d8212 106d1a0a

drivers/acpi/osl.c

+7 −4
Original line number Diff line number Diff line
@@ -1233,8 +1233,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup); 
int acpi_check_resource_conflict(const struct resource *res)

{

	struct acpi_res_list *res_list_elem;

	int ioport;

	int clash = 0;

	int ioport = 0, clash = 0;



	if (acpi_enforce_resources == ENFORCE_RESOURCES_NO)

		return 0;
@@ -1264,9 +1263,13 @@ int acpi_check_resource_conflict(const struct resource *res) 
	if (clash) {

		if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) {

			printk(KERN_WARNING "ACPI: resource %s %pR"

			       " conflicts with ACPI region %s %pR\n",

			       " conflicts with ACPI region %s "

			       "[%s 0x%zx-0x%zx]\n",

			       res->name, res, res_list_elem->name,

			       res_list_elem);

			       (res_list_elem->resource_type ==

				ACPI_ADR_SPACE_SYSTEM_IO) ? "io" : "mem",

			       (size_t) res_list_elem->start,

			       (size_t) res_list_elem->end);

			if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX)

				printk(KERN_NOTICE "ACPI: This conflict may"

				       " cause random problems and system"