From patchwork Wed Jan 21 20:40:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Huewe X-Patchwork-Id: 5680401 Return-Path: X-Original-To: patchwork-tpmdd-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C4AC0C058D for ; Wed, 21 Jan 2015 20:38:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E4FEC2046F for ; Wed, 21 Jan 2015 20:38:29 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 191DA201CD for ; Wed, 21 Jan 2015 20:38:28 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YE22k-00035F-7C; Wed, 21 Jan 2015 20:38:26 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YE22i-000354-Vr for tpmdd-devel@lists.sourceforge.net; Wed, 21 Jan 2015 20:38:24 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of gmx.de designates 212.227.17.20 as permitted sender) client-ip=212.227.17.20; envelope-from=peterhuewe@gmx.de; helo=mout.gmx.net; Received: from mout.gmx.net ([212.227.17.20]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1YE22h-0004T5-R0 for tpmdd-devel@lists.sourceforge.net; Wed, 21 Jan 2015 20:38:24 +0000 Received: from localhost.localdomain ([84.56.35.40]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0Lskr7-1XYk9J3osb-012IeA; Wed, 21 Jan 2015 21:38:09 +0100 From: Peter Huewe To: Stephen Rothwell Date: Wed, 21 Jan 2015 21:40:15 +0100 Message-Id: <1421872815-16644-1-git-send-email-peterhuewe@gmx.de> X-Mailer: git-send-email 2.0.5 MIME-Version: 1.0 X-Provags-ID: V03:K0:CsJ01KukR6siEk/QrZ71FwKO5ur2ZGeFUeFzBIpNert54dvxkVg LLHW1razKLENNg4LBnXmPqj6SRKMCgtfkTAE06WN16/JuAEIDicpuBKruF1+jaoE33AN9A8 ejgRlbp0X7iQ6fLCKG21txuk4I3gIXBRQHBZr0hYmQ1xknXTXmNRUIOlDScVu61/D3uaJ0l nGJ+/N/GrVpeCdy0MzrJQ== X-UI-Out-Filterresults: notjunk:1; X-Spam-Score: -1.5 (-) X-Headers-End: 1YE22h-0004T5-R0 Cc: tpmdd-devel@lists.sourceforge.net, linux-next , Jim Davis Subject: [tpmdd-devel] [PATCH] tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: tpmdd-devel-bounces@lists.sourceforge.net X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HK_RANDOM_ENVFROM, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This fixes a build failure if CONFIG_PNP is set but CONFIG_ACPI is not: drivers/char/tpm/tpm_tis.c: In function ‘tpm_tis_pnp_init’: drivers/char/tpm/tpm_tis.c:912:45: error: invalid type argument of ‘->’ (have ‘int’) acpi_dev_handle = pnp_acpi_device(pnp_dev)->handle; If CONFIG_PNPACPI is not set pnp_acpi_device is defined as 0 and thus accesing the handle is not possible. Fixes: 0dc553652102 ("tpm: fix raciness of PPI interface lookup") Reported-by: Jim Davis Signed-off-by: Peter Huewe --- drivers/char/tpm/tpm_tis.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 20a61bc98db8..6725bef7cb96 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -908,8 +908,10 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev, if (is_itpm(pnp_dev)) itpm = true; +#ifdef CONFIG_ACPI if (pnp_acpi_device(pnp_dev)) acpi_dev_handle = pnp_acpi_device(pnp_dev)->handle; +#endif return tpm_tis_init(&pnp_dev->dev, acpi_dev_handle, start, len, irq); }