From 59e6423ba8aaa42289457a15ffc7d111a955a2fa Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Wed, 22 Aug 2012 14:24:36 +0800 Subject: 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 Signed-off-by: Bob Moore Cc: Matthew Garrett Cc: Greg Kroah-Hartman Cc: Lan Tianyu Signed-off-by: Len Brown --- drivers/usb/core/usb-acpi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/usb/core') diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index 8947b20..ce45f55 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; } -- cgit v1.1