summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ec.c
diff options
context:
space:
mode:
authorHannes Eder <hannes@hanneseder.net>2008-11-29 07:21:29 +0100
committerLen Brown <len.brown@intel.com>2008-11-30 00:10:31 -0500
commit3e54048691bce3f323fd5460695273be379803b9 (patch)
tree53961b52b6db754a48f02fb93425c78379719f9b /drivers/acpi/ec.c
parentc5279dee26c0e8d7c4200993bfc4b540d2469598 (diff)
downloadop-kernel-dev-3e54048691bce3f323fd5460695273be379803b9.zip
op-kernel-dev-3e54048691bce3f323fd5460695273be379803b9.tar.gz
ACPI: EC: fix compilation warning
Fix the warning introduced in commit c5279dee26c0e8d7c4200993bfc4b540d2469598, and give the dummy variable a more verbose name. drivers/acpi/ec.c: In function 'acpi_ec_ecdt_probe': drivers/acpi/ec.c:1015: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Hannes Eder <hannes@hanneseder.net> Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r--drivers/acpi/ec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 3ba034f..6276e5c 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -979,6 +979,7 @@ int __init acpi_ec_ecdt_probe(void)
{
acpi_status status;
struct acpi_table_ecdt *ecdt_ptr;
+ acpi_handle dummy;
boot_ec = make_acpi_ec();
if (!boot_ec)
@@ -1011,7 +1012,6 @@ int __init acpi_ec_ecdt_probe(void)
}
/* This workaround is needed only on some broken machines,
* which require early EC, but fail to provide ECDT */
- acpi_handle x;
printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
boot_ec, NULL);
@@ -1022,7 +1022,7 @@ int __init acpi_ec_ecdt_probe(void)
* which needs it, has fake EC._INI method, so use it as flag.
* Keep boot_ec struct as it will be needed soon.
*/
- if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
+ if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy)))
return -ENODEV;
install:
if (!ec_install_handlers(boot_ec)) {
OpenPOWER on IntegriCloud