From patchwork Fri Dec 27 05:36:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 11310907 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AFBE06C1 for ; Fri, 27 Dec 2019 05:36:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 816F520828 for ; Fri, 27 Dec 2019 05:36:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725936AbfL0FgU (ORCPT ); Fri, 27 Dec 2019 00:36:20 -0500 Received: from mga02.intel.com ([134.134.136.20]:39754 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725854AbfL0FgU (ORCPT ); Fri, 27 Dec 2019 00:36:20 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Dec 2019 21:36:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,361,1571727600"; d="scan'208";a="212556933" Received: from psklarow-mobl.ger.corp.intel.com (HELO localhost) ([10.252.31.109]) by orsmga008.jf.intel.com with ESMTP; 26 Dec 2019 21:36:15 -0800 From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Stefan Berger , Jerry Snitselaar , Dan Williams , stable@vger.kernel.org, Jarkko Sakkinen , Peter Huewe , Jason Gunthorpe , Arnd Bergmann , Greg Kroah-Hartman , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] tpm: Revert "tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts" Date: Fri, 27 Dec 2019 07:36:10 +0200 Message-Id: <20191227053610.11160-1-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org From: Stefan Berger Revert the patch that was setting the TPM_CHIP_FLAG_IRQ before probing for interrupts. Cc: Jerry Snitselaar Cc: Dan Williams Fixes: 1ea32c83c699 ("tpm_tis_core: Set TPM_CHIP_FLAG_IRQ before probing for interrupts") Signed-off-by: Stefan Berger Reported-by: Jerry Snitselaar Cc: stable@vger.kernel.org Signed-off-by: Jarkko Sakkinen --- Please check and inform if also 2/2 of Stefan's patches is needed. I'll prepare the PR accordingly. Thanks. drivers/char/tpm/tpm_tis_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index bb0343ffd235..7ee29e25cb3b 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -1059,7 +1059,6 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, goto err_probe; } - chip->flags |= TPM_CHIP_FLAG_IRQ; if (irq) { tpm_tis_probe_irq_single(chip, intmask, IRQF_SHARED, irq);