diff options
author | Feng Tang <feng.tang@intel.com> | 2012-08-22 02:24:36 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-09-21 00:32:51 -0400 |
commit | 59e6423ba8aaa42289457a15ffc7d111a955a2fa (patch) | |
tree | b14bc18246005250000207587ddb5fc9b1fd7f2e /drivers/usb | |
parent | 8ede06aba5dffa78a27a18c47a9059eb38072ada (diff) |
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')
-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 8947b203d5a4..ce45f5535236 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c | |||
@@ -52,18 +52,19 @@ out: | |||
52 | static int usb_acpi_check_pld(struct usb_device *udev, acpi_handle handle) | 52 | static int usb_acpi_check_pld(struct usb_device *udev, acpi_handle handle) |
53 | { | 53 | { |
54 | acpi_status status; | 54 | acpi_status status; |
55 | struct acpi_pld pld; | 55 | struct acpi_pld_info *pld; |
56 | 56 | ||
57 | status = acpi_get_physical_device_location(handle, &pld); | 57 | status = acpi_get_physical_device_location(handle, &pld); |
58 | 58 | ||
59 | if (ACPI_FAILURE(status)) | 59 | if (ACPI_FAILURE(status)) |
60 | return -ENODEV; | 60 | return -ENODEV; |
61 | 61 | ||
62 | if (pld.user_visible) | 62 | if (pld->user_visible) |
63 | udev->removable = USB_DEVICE_REMOVABLE; | 63 | udev->removable = USB_DEVICE_REMOVABLE; |
64 | else | 64 | else |
65 | udev->removable = USB_DEVICE_FIXED; | 65 | udev->removable = USB_DEVICE_FIXED; |
66 | 66 | ||
67 | ACPI_FREE(pld); | ||
67 | return 0; | 68 | return 0; |
68 | } | 69 | } |
69 | 70 | ||