From patchwork Sun Sep 23 04:34:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 1494981 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 B39383FC71 for ; Sun, 23 Sep 2012 04:39:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753730Ab2IWEff (ORCPT ); Sun, 23 Sep 2012 00:35:35 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:41520 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753514Ab2IWEfK (ORCPT ); Sun, 23 Sep 2012 00:35:10 -0400 Received: by mail-qc0-f174.google.com with SMTP id o28so3582038qcr.19 for ; Sat, 22 Sep 2012 21:35:10 -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=AJc13sp3fWIcvqERpH/k73dhjDl4QVXx4vKDODyuuFI=; b=IDOSnl8ZWgWv854evr9ngdw/uF0xGS7CzOM13tdEb+eqH6AvXbgCH6O6FT7/aKpCQl QHoPU7qdKR8ng3r8eafso2JrYUI91oWIUbvE2QGjMaWeUkqXkB0lYyukJ6uTHq79rKNG njhwmQ75ZbmrzY2Nz4LZKLWA74e3vEsReX36IcNIpREllzN9T4HKwx/4S9STIkXxG+zJ FHZZlkBm75UBE0Ux9YR0Lkex0hEB/lfHaGehn9r0g2u7FMvAm7RS5t9fV1Sq2vKalaK/ VpnJNieniZ94C4+do+xNbWE4z4p3VVTP7KirukDnaXxM0QPs3KItbXb1g9OOBVrYwSr1 4w/Q== Received: by 10.224.179.197 with SMTP id br5mr9914078qab.34.1348374910030; Sat, 22 Sep 2012 21:35:10 -0700 (PDT) Received: from x980.localdomain6 (pool-74-104-144-44.bstnma.fios.verizon.net. [74.104.144.44]) by mx.google.com with ESMTPS id ck11sm19871874qab.17.2012.09.22.21.35.05 (version=SSLv3 cipher=OTHER); Sat, 22 Sep 2012 21:35:07 -0700 (PDT) From: Len Brown To: linux-acpi@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/23] usb-acpi: Comply with the ACPI API change Date: Sun, 23 Sep 2012 00:34:02 -0400 Message-Id: <59e6423ba8aaa42289457a15ffc7d111a955a2fa.1348371388.git.len.brown@intel.com> X-Mailer: git-send-email 1.7.12.1.396.g16eed7c In-Reply-To: <1348374851-20378-1-git-send-email-lenb@kernel.org> References: <1348374851-20378-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 Acked-by: Greg Kroah-Hartman --- 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; }