diff options
| author | Rafael J. Wysocki <[email protected]> | 2013-11-16 15:44:44 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2013-11-16 15:44:44 +0100 |
| commit | a7d2472d8145f6d0729317e3cabe2d0f1a14a87a (patch) | |
| tree | c15eceef4afd84dea49c8f40ae9b45349ce350a8 /drivers/usb/core/hub.c | |
| parent | 2f466d33f5f60542d3d82c0477de5863b22c94b9 (diff) | |
| parent | 86b0cc12bba9cb9cc3c20974dec565f44c961fc3 (diff) | |
Merge branch 'acpi-driver-core'
* acpi-driver-core:
ACPI / AC: Remove struct acpi_device pointer from struct acpi_ac
spi: Use stable dev_name for ACPI enumerated SPI slaves
i2c: Use stable dev_name for ACPI enumerated I2C slaves
ACPI: Provide acpi_dev_name accessor for struct acpi_device device name
ACPI / bind: Use (put|get)_device() on ACPI device objects too
ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro
ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node
Diffstat (limited to 'drivers/usb/core/hub.c')
| -rw-r--r-- | drivers/usb/core/hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 06cec635e703..a7c04e24ca48 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5501,6 +5501,6 @@ acpi_handle usb_get_hub_port_acpi_handle(struct usb_device *hdev, if (!hub) return NULL; - return DEVICE_ACPI_HANDLE(&hub->ports[port1 - 1]->dev); + return ACPI_HANDLE(&hub->ports[port1 - 1]->dev); } #endif |