Skip to content

Commit

Permalink
usb-acpi: Comply with the ACPI API change
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Feng Tang authored and Len Brown committed Sep 21, 2012
1 parent 8ede06a commit 59e6423
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/usb/core/usb-acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,19 @@ static int usb_acpi_check_upc(struct usb_device *udev, acpi_handle handle)
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;
}

Expand Down

0 comments on commit 59e6423

Please sign in to comment.