diff options
| author | Feng Tang <feng.tang@intel.com> | 2012-08-22 14:24:36 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-09-21 00:32:51 -0400 |
| commit | 59e6423ba8aaa42289457a15ffc7d111a955a2fa (patch) | |
| tree | b14bc18246005250000207587ddb5fc9b1fd7f2e /drivers/usb/core/usb-acpi.c | |
| parent | 8ede06aba5dffa78a27a18c47a9059eb38072ada (diff) | |
| download | olio-linux-3.10-59e6423ba8aaa42289457a15ffc7d111a955a2fa.tar.xz olio-linux-3.10-59e6423ba8aaa42289457a15ffc7d111a955a2fa.zip | |
usb-acpi: Comply with the ACPI API change
acpi_get_physical_device_location()'s 2nd argument has been changed
in ACPI implementaion, so need a follow-on change in
usb_acpi_check_pld().
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Lan Tianyu <tianyu.lan@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/usb/core/usb-acpi.c')
| -rw-r--r-- | drivers/usb/core/usb-acpi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index 8947b203d5a..ce45f553523 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c @@ -52,18 +52,19 @@ out: static int usb_acpi_check_pld(struct usb_device *udev, acpi_handle handle) { acpi_status status; - struct acpi_pld pld; + struct acpi_pld_info *pld; status = acpi_get_physical_device_location(handle, &pld); if (ACPI_FAILURE(status)) return -ENODEV; - if (pld.user_visible) + if (pld->user_visible) udev->removable = USB_DEVICE_REMOVABLE; else udev->removable = USB_DEVICE_FIXED; + ACPI_FREE(pld); return 0; } |