linux-next: build failure after merge of the acpi tree

[Stephen Rothwell]

Hi Len,

After merging the acpi tree, today's linux-next build (x86_64_allmodconfig)
failed like this:

drivers/usb/core/usb-acpi.c: In function 'usb_acpi_check_port_connect_type':
drivers/usb/core/usb-acpi.c:90:18: error: storage size of 'pld' isn't known

Caused by commit 05f916894a69 ("usb/acpi: Store info on device
removability") from Linus' tree interacting with commit 8ede06aba5df
("ACPI: Use ACPICA native way to decode the PLD buffer") from the acpi
tree.

I applied this merge fix that I have been applying to the usb tree (which
has now been merged by Linus).

From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Mon, 24 Sep 2012 16:51:38 +1000
Subject: [PATCH] usb-acpi: Comply with the ACPI API change after usb tree merge

Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
 drivers/usb/core/usb-acpi.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index 0ef7d42..e9b159a 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -87,7 +87,7 @@ static int usb_acpi_check_port_connect_type(struct usb_device 
*hdev,
        acpi_status status;
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        union acpi_object *upc;
-       struct acpi_pld pld;
+       struct acpi_pld_info *pld;
        int ret = 0;
 
        /*
@@ -111,13 +111,13 @@ static int usb_acpi_check_port_connect_type(struct 
usb_device *hdev,
        }
 
        if (upc->package.elements[0].integer.value)
-               if (pld.user_visible)
+               if (pld->user_visible)
                        usb_set_hub_port_connect_type(hdev, port1,
                                USB_PORT_CONNECT_TYPE_HOT_PLUG);
                else
                        usb_set_hub_port_connect_type(hdev, port1,
                                USB_PORT_CONNECT_TYPE_HARD_WIRED);
-       else if (!pld.user_visible)
+       else if (!pld->user_visible)
                usb_set_hub_port_connect_type(hdev, port1, USB_PORT_NOT_USED);
 
 out:

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

pgpInAZvF9q1Q.pgp
Description: PGP signature