From patchwork Sat Oct 6 20:09:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 1559241 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A259A3FD56 for ; Sat, 6 Oct 2012 20:14:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751678Ab2JFUOP (ORCPT ); Sat, 6 Oct 2012 16:14:15 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:52672 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284Ab2JFUOO (ORCPT ); Sat, 6 Oct 2012 16:14:14 -0400 Received: by mail-qc0-f174.google.com with SMTP id d3so1916825qch.19 for ; Sat, 06 Oct 2012 13:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:reply-to:organization; bh=TSo24AnG9iTbDzHLPye9aC6EJNlcKepWWfK4WqjeLQI=; b=eqqFHqA1CN+PaSSRKKjUOeFBWgmv5SY4sbHttBHQvPV9BfMjlVU3f8Bz53sH13lmd7 i9c0ZuG1Xj+ag1ADCFy/Vonxw0bOnXE9wPFakx6Wij0sqx6spJ6O6z9OEcuTfZaaNSPe rFgof3hL0XW4XUnL7Gz7s5djF9M/kkhJ/kwKvcUVPzshMPa4z+TwbYnJQ0OmtbvTTDC4 DmDwwfXhsIDvp8QCl3Rlq8IdiJSgXtCho8vfBZCiZ+11IZ9T9GmvC9AAzFf/bQww39M1 S8C07BD9ZCRe1W/fmJLhqq/JzSy5xrlpZ7q3Vh7qG4QIvhGrjK6WxVLFUhzMQkdofr/2 PkfA== Received: by 10.49.14.198 with SMTP id r6mr32773658qec.14.1349554453949; Sat, 06 Oct 2012 13:14:13 -0700 (PDT) Received: from x980.localdomain6 (pool-74-104-146-186.bstnma.fios.verizon.net. [74.104.146.186]) by mx.google.com with ESMTPS id x19sm13470740qeq.12.2012.10.06.13.13.53 (version=SSLv3 cipher=OTHER); Sat, 06 Oct 2012 13:13:59 -0700 (PDT) From: Len Brown To: linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Feng Tang , Bob Moore , Matthew Garrett , Greg Kroah-Hartman , Lan Tianyu , Len Brown Subject: [PATCH 14/49] usb-acpi: Comply with the ACPI API change Date: Sat, 6 Oct 2012 16:09:35 -0400 Message-Id: <59e6423ba8aaa42289457a15ffc7d111a955a2fa.1349554106.git.len.brown@intel.com> X-Mailer: git-send-email 1.8.0.rc0.18.gf84667d In-Reply-To: <1349554210-29978-1-git-send-email-lenb@kernel.org> References: <1349554210-29978-1-git-send-email-lenb@kernel.org> In-Reply-To: References: Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Feng Tang 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(-) 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; }