diff options
Diffstat (limited to 'drivers/acpi/pci_link.c')
| -rw-r--r-- | drivers/acpi/pci_link.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index cf47805a744..fcfdef7b4fd 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
| @@ -709,7 +709,7 @@ int acpi_pci_link_free_irq(acpi_handle handle) | |||
| 709 | acpi_device_bid(link->device))); | 709 | acpi_device_bid(link->device))); |
| 710 | 710 | ||
| 711 | if (link->refcnt == 0) { | 711 | if (link->refcnt == 0) { |
| 712 | acpi_ut_evaluate_object(link->device->handle, "_DIS", 0, NULL); | 712 | acpi_evaluate_object(link->device->handle, "_DIS", NULL, NULL); |
| 713 | } | 713 | } |
| 714 | mutex_unlock(&acpi_link_lock); | 714 | mutex_unlock(&acpi_link_lock); |
| 715 | return (link->irq.active); | 715 | return (link->irq.active); |
| @@ -737,7 +737,7 @@ static int acpi_pci_link_add(struct acpi_device *device) | |||
| 737 | link->device = device; | 737 | link->device = device; |
| 738 | strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME); | 738 | strcpy(acpi_device_name(device), ACPI_PCI_LINK_DEVICE_NAME); |
| 739 | strcpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS); | 739 | strcpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS); |
| 740 | acpi_driver_data(device) = link; | 740 | device->driver_data = link; |
| 741 | 741 | ||
| 742 | mutex_lock(&acpi_link_lock); | 742 | mutex_lock(&acpi_link_lock); |
| 743 | result = acpi_pci_link_get_possible(link); | 743 | result = acpi_pci_link_get_possible(link); |
| @@ -773,7 +773,7 @@ static int acpi_pci_link_add(struct acpi_device *device) | |||
| 773 | 773 | ||
| 774 | end: | 774 | end: |
| 775 | /* disable all links -- to be activated on use */ | 775 | /* disable all links -- to be activated on use */ |
| 776 | acpi_ut_evaluate_object(device->handle, "_DIS", 0, NULL); | 776 | acpi_evaluate_object(device->handle, "_DIS", NULL, NULL); |
| 777 | mutex_unlock(&acpi_link_lock); | 777 | mutex_unlock(&acpi_link_lock); |
| 778 | 778 | ||
| 779 | if (result) | 779 | if (result) |
