diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 05:45:22 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 05:45:22 (GMT) |
| commit | 985f38781d19101aba121df423f92c87b208c6df (patch) | |
| tree | 21b10413b6e24c0eaf5c3b2432e936749a672644 /drivers/ide | |
| parent | d093d70a81b08673d1577ad73419998f02be9d29 (diff) | |
| parent | c9766237afa92e8d7f27bbcd4964f1b43fa0bce8 (diff) | |
| download | linux-985f38781d19101aba121df423f92c87b208c6df.tar.xz | |
Merge branch 'acpica' into release
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-acpi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index c509c99..c0cf45a 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -114,8 +114,6 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, unsigned int bus, devnum, func; acpi_integer addr; acpi_handle dev_handle; - struct acpi_buffer buffer = {.length = ACPI_ALLOCATE_BUFFER, - .pointer = NULL}; acpi_status status; struct acpi_device_info *dinfo = NULL; int ret = -ENODEV; @@ -134,12 +132,11 @@ static int ide_get_dev_handle(struct device *dev, acpi_handle *handle, goto err; } - status = acpi_get_object_info(dev_handle, &buffer); + status = acpi_get_object_info(dev_handle, &dinfo); if (ACPI_FAILURE(status)) { DEBPRINT("get_object_info for device failed\n"); goto err; } - dinfo = buffer.pointer; if (dinfo && (dinfo->valid & ACPI_VALID_ADR) && dinfo->address == addr) { *pcidevfn = addr; |