Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202493
b: refs/heads/master
c: b52e042
h: refs/heads/master
i:
  202491: de56d48
v: v3
  • Loading branch information
Thomas Renninger authored and Matthew Garrett committed Aug 3, 2010
1 parent c078213 commit a786c02
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9827886dce77c47c378ce3154689cea2c45c731d
refs/heads/master: b52e04216fcd86968c01ad0cfdb249375f19134d
12 changes: 10 additions & 2 deletions trunk/drivers/acpi/ec.c
Original file line number Diff line number Diff line change
Expand Up @@ -864,10 +864,18 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
* the second address region returned is the status/command
* port.
*/
if (ec->data_addr == 0)
if (ec->data_addr == 0) {
ec->data_addr = resource->data.io.minimum;
else if (ec->command_addr == 0)
WARN(!request_region(ec->data_addr, 1, "EC data"),
"Could not request EC data io port %lu",
ec->data_addr);
}
else if (ec->command_addr == 0) {
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
return AE_CTRL_TERMINATE;

Expand Down

0 comments on commit a786c02

Please sign in to comment.