lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

acpi ec: Fix possible double io port registration

Browse Source 
which will result in a harmless but ugly WARN message on
some machines.

Signed-off-by: Thomas Renninger <trenn@suse.de>
CC: mjg59@srcf.ucam.org
CC: platform-driver-x86@vger.kernel.org
CC: linux-acpi@vger.kernel.org
CC: astarikovskiy@suse.de
CC: akpm@linux-foundation.org
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Thomas Renninger
2010-07-29 22:08:44 +02:00
committed by Matthew Garrett
parent 7a0691c16f
commit de4f10466e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/acpi/ec.c
View File

@@ -818,6 +818,12 @@ static int acpi_ec_add(struct acpi_device *device)
if (!first_ec) if (!first_ec)
first_ec = ec; first_ec = ec;
device->driver_data = 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);
pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n", pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
ec->gpe, ec->command_addr, ec->data_addr); ec->gpe, ec->command_addr, ec->data_addr);
@@ -844,6 +850,8 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
kfree(handler); kfree(handler);
} }
mutex_unlock(&ec->lock); mutex_unlock(&ec->lock);
release_region(ec->data_addr, 1);
release_region(ec->command_addr, 1);
device->driver_data = NULL; device->driver_data = NULL;
if (ec == first_ec) if (ec == first_ec)
first_ec = NULL; first_ec = NULL;
@@ -864,18 +872,10 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
* the second address region returned is the status/command * the second address region returned is the status/command
* port. * port.
*/ */
if (ec->data_addr == 0) { if (ec->data_addr == 0)
ec->data_addr = resource->data.io.minimum; ec->data_addr = resource->data.io.minimum;
WARN(!request_region(ec->data_addr, 1, "EC data"), else if (ec->command_addr == 0)
"Could not request EC data io port %lu",
ec->data_addr);
}
else if (ec->command_addr == 0) {
ec->command_addr = resource->data.io.minimum; ec->command_addr = resource->data.io.minimum;
WARN(!request_region(ec->command_addr, 1, "EC command"),
"Could not request EC command io port %lu",
ec->command_addr);
}
else else
return AE_CTRL_TERMINATE; return AE_CTRL_TERMINATE;