diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /drivers/acpi/i2c_ec.c | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/acpi/i2c_ec.c')
| -rw-r--r-- | drivers/acpi/i2c_ec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/i2c_ec.c b/drivers/acpi/i2c_ec.c index 84239d51dc0c..6809c283ec58 100644 --- a/drivers/acpi/i2c_ec.c +++ b/drivers/acpi/i2c_ec.c | |||
| @@ -330,7 +330,7 @@ static int acpi_ec_hc_add(struct acpi_device *device) | |||
| 330 | status = acpi_evaluate_integer(ec_hc->handle, "_EC", NULL, &val); | 330 | status = acpi_evaluate_integer(ec_hc->handle, "_EC", NULL, &val); |
| 331 | if (ACPI_FAILURE(status)) { | 331 | if (ACPI_FAILURE(status)) { |
| 332 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Error obtaining _EC\n")); | 332 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Error obtaining _EC\n")); |
| 333 | kfree(ec_hc->smbus); | 333 | kfree(ec_hc); |
| 334 | kfree(smbus); | 334 | kfree(smbus); |
| 335 | return -EIO; | 335 | return -EIO; |
| 336 | } | 336 | } |