usb-acpi: Comply with the ACPI API change
authorFeng Tang <feng.tang@intel.com>
Wed, 22 Aug 2012 06:24:36 +0000 (14:24 +0800)
committerLen Brown <len.brown@intel.com>
Fri, 21 Sep 2012 04:32:51 +0000 (00:32 -0400)
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>
drivers/usb/core/usb-acpi.c

index 8947b20..ce45f55 100644 (file)
@@ -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;
 }