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

Commit d6795fe3 authored by Andi Kleen's avatar Andi Kleen Committed by Len Brown
Browse files

ACPI: ec: Do request_region outside WARN() 



WARN() is not supposed to have side effects, so move the request_regions
outside.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c16fa4f2

drivers/acpi/ec.c

+4 −4
Original line number Diff line number Diff line
@@ -812,10 +812,10 @@ static int acpi_ec_add(struct acpi_device *device) 
		first_ec = ec;

	device->driver_data = ec;



	WARN(!request_region(ec->data_addr, 1, "EC data"),

	     "Could not request EC data io port 0x%lx", ec->data_addr);

	WARN(!request_region(ec->command_addr, 1, "EC cmd"),

	     "Could not request EC cmd io port 0x%lx", ec->command_addr);

	ret = !!request_region(ec->data_addr, 1, "EC data");

	WARN(!ret, "Could not request EC data io port 0x%lx", ec->data_addr);

	ret = !!request_region(ec->command_addr, 1, "EC cmd");

	WARN(!ret, "Could not request EC cmd io port 0x%lx", ec->command_addr);



	pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",

			  ec->gpe, ec->command_addr, ec->data_addr);