diff options
| author | Andi Kleen <andi@firstfloor.org> | 2012-02-06 08:17:08 -0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 01:41:35 -0400 |
| commit | d6795fe32da13bde39ea483e42799a22daa730b5 (patch) | |
| tree | 96be9f242dbc6b38a1cf54f96dccaeca72227490 /drivers/acpi | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
| download | linux-3.10-d6795fe32da13bde39ea483e42799a22daa730b5.tar.gz linux-3.10-d6795fe32da13bde39ea483e42799a22daa730b5.tar.bz2 linux-3.10-d6795fe32da13bde39ea483e42799a22daa730b5.zip | |
ACPI: ec: Do request_region outside WARN()
WARN() is not supposed to have side effects, so move the request_regions
outside.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/ec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index b19a18dd994..3268dcfbaa9 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -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); |