From 414a2da11baef7b0b9ee6caf6c5e5c28aa462b5b Mon Sep 17 00:00:00 2001
From: Feng Tang <feng.tang@intel.com>
Date: Wed, 22 Aug 2012 14:24:36 +0800
Subject: [PATCH] --- yaml --- r: 331711 b: refs/heads/master c:
 59e6423ba8aaa42289457a15ffc7d111a955a2fa h: refs/heads/master i:   331709:
 cef80951ff06e2443fb9038d2e572c8e2c1cd108   331707:
 9ea5a90c209d29f2e805371265c27253559378bc   331703:
 b182fd56fdc6589e87bc6c2f9e3a1784669584a9   331695:
 cbd8a2bb7dba1e64950d2a411a76916b103315f5   331679:
 61063805b4aa69dde43dd4bee875955d7cc64f69   331647:
 e201068c0031e4a3e762f1468f5e558bd8e167c1 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/core/usb-acpi.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 630ad2f2715c..b73372c82541 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ede06aba5dffa78a27a18c47a9059eb38072ada
+refs/heads/master: 59e6423ba8aaa42289457a15ffc7d111a955a2fa
diff --git a/trunk/drivers/usb/core/usb-acpi.c b/trunk/drivers/usb/core/usb-acpi.c
index 8947b203d5a4..ce45f5535236 100644
--- a/trunk/drivers/usb/core/usb-acpi.c
+++ b/trunk/drivers/usb/core/usb-acpi.c
@@ -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;
 }