diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/pci_link.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 1badce27a83f..68ee80a6e6f7 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -175,7 +175,7 @@ static int acpi_pci_link_get_possible(struct acpi_pci_link *link) | |||
175 | if (!link) | 175 | if (!link) |
176 | return -EINVAL; | 176 | return -EINVAL; |
177 | 177 | ||
178 | status = acpi_walk_resources(link->handle, METHOD_NAME__PRS, | 178 | status = acpi_walk_resources(link->device->handle, METHOD_NAME__PRS, |
179 | acpi_pci_link_check_possible, link); | 179 | acpi_pci_link_check_possible, link); |
180 | if (ACPI_FAILURE(status)) { | 180 | if (ACPI_FAILURE(status)) { |
181 | ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRS")); | 181 | ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PRS")); |
@@ -274,7 +274,7 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link) | |||
274 | * Query and parse _CRS to get the current IRQ assignment. | 274 | * Query and parse _CRS to get the current IRQ assignment. |
275 | */ | 275 | */ |
276 | 276 | ||
277 | status = acpi_walk_resources(link->handle, METHOD_NAME__CRS, | 277 | status = acpi_walk_resources(link->device->handle, METHOD_NAME__CRS, |
278 | acpi_pci_link_check_current, &irq); | 278 | acpi_pci_link_check_current, &irq); |
279 | if (ACPI_FAILURE(status)) { | 279 | if (ACPI_FAILURE(status)) { |
280 | ACPI_EXCEPTION((AE_INFO, status, "Evaluating _CRS")); | 280 | ACPI_EXCEPTION((AE_INFO, status, "Evaluating _CRS")); |
@@ -360,7 +360,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
360 | resource->end.type = ACPI_RESOURCE_TYPE_END_TAG; | 360 | resource->end.type = ACPI_RESOURCE_TYPE_END_TAG; |
361 | 361 | ||
362 | /* Attempt to set the resource */ | 362 | /* Attempt to set the resource */ |
363 | status = acpi_set_current_resources(link->handle, &buffer); | 363 | status = acpi_set_current_resources(link->device->handle, &buffer); |
364 | 364 | ||
365 | /* check for total failure */ | 365 | /* check for total failure */ |
366 | if (ACPI_FAILURE(status)) { | 366 | if (ACPI_FAILURE(status)) { |
@@ -699,7 +699,7 @@ int acpi_pci_link_free_irq(acpi_handle handle) | |||
699 | acpi_device_bid(link->device))); | 699 | acpi_device_bid(link->device))); |
700 | 700 | ||
701 | if (link->refcnt == 0) { | 701 | if (link->refcnt == 0) { |
702 | acpi_ut_evaluate_object(link->handle, "_DIS", 0, NULL); | 702 | acpi_ut_evaluate_object(link->device->handle, "_DIS", 0, NULL); |
703 | } | 703 | } |
704 | mutex_unlock(&acpi_link_lock); | 704 | mutex_unlock(&acpi_link_lock); |
705 | return (link->irq.active); | 705 | return (link->irq.active); |
@@ -765,7 +765,7 @@ static int acpi_pci_link_add(struct acpi_device *device) | |||
765 | 765 | ||
766 | end: | 766 | end: |
767 | /* disable all links -- to be activated on use */ | 767 | /* disable all links -- to be activated on use */ |
768 | acpi_ut_evaluate_object(link->handle, "_DIS", 0, NULL); | 768 | acpi_ut_evaluate_object(device->handle, "_DIS", 0, NULL); |
769 | mutex_unlock(&acpi_link_lock); | 769 | mutex_unlock(&acpi_link_lock); |
770 | 770 | ||
771 | if (result) | 771 | if (result) |