From patchwork Tue Jan 31 18:34:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 9548007 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AB77C60415 for ; Tue, 31 Jan 2017 18:35:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DE302808C for ; Tue, 31 Jan 2017 18:35:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 924A728285; Tue, 31 Jan 2017 18:35:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 231222808C for ; Tue, 31 Jan 2017 18:35:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751272AbdAaSfn (ORCPT ); Tue, 31 Jan 2017 13:35:43 -0500 Received: from mga09.intel.com ([134.134.136.24]:22552 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195AbdAaSfm (ORCPT ); Tue, 31 Jan 2017 13:35:42 -0500 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP; 31 Jan 2017 10:34:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,315,1477983600"; d="scan'208";a="59633747" Received: from mbrennan-mobl3.ger.corp.intel.com (HELO localhost) ([10.252.3.129]) by fmsmga005.fm.intel.com with ESMTP; 31 Jan 2017 10:34:30 -0800 From: Jarkko Sakkinen To: tpmdd-devel@lists.sourceforge.net Cc: linux-security-module@vger.kernel.org, Jarkko Sakkinen , Peter Huewe , Marcel Selhorst , Jason Gunthorpe , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] tpm, tpm_crb: fix a type error Date: Tue, 31 Jan 2017 20:34:28 +0200 Message-Id: <20170131183428.9472-1-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.9.3 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Fixes: 422eac3f7dea ("tpm_crb: fix mapping of the buffers") Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_crb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 86f355b..4db7922 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -304,7 +304,7 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, u32 pa_high, pa_low; u64 cmd_pa; u32 cmd_size; - u64 rsp_pa; + __le64 rsp_pa; u32 rsp_size; int ret; @@ -352,11 +352,11 @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, } memcpy_fromio(&rsp_pa, &priv->cca->rsp_pa, 8); - rsp_pa = le64_to_cpu(rsp_pa); rsp_size = ioread32(&priv->cca->rsp_size); - if (cmd_pa != rsp_pa) { - priv->rsp = crb_map_res(dev, priv, &io_res, rsp_pa, rsp_size); + if (cmd_pa != le64_to_cpu(rsp_pa)) { + priv->rsp = crb_map_res(dev, priv, &io_res, + le64_to_cpu(rsp_pa), rsp_size); ret = PTR_ERR_OR_ZERO(priv->rsp); goto out; }