From patchwork Tue Nov 15 15:57:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101526 Delivered-To: patch@linaro.org Received: by 10.182.1.168 with SMTP id 8csp1782538obn; Tue, 15 Nov 2016 07:58:18 -0800 (PST) X-Received: by 10.98.144.213 with SMTP id q82mr48067605pfk.56.1479225498815; Tue, 15 Nov 2016 07:58:18 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si26995510pfh.232.2016.11.15.07.58.18; Tue, 15 Nov 2016 07:58:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752979AbcKOP6O (ORCPT + 26 others); Tue, 15 Nov 2016 10:58:14 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:57611 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633AbcKOP6N (ORCPT ); Tue, 15 Nov 2016 10:58:13 -0500 Received: from wuerfel.lan ([78.43.21.235]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0LeQLR-1caCYz1Wwv-00q9cK; Tue, 15 Nov 2016 16:57:40 +0100 From: Arnd Bergmann To: Jarkko Sakkinen Cc: Arnd Bergmann , Peter Huewe , Marcel Selhorst , Jason Gunthorpe , Nayna Jain , tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] tpm: fix node pointer lookup Date: Tue, 15 Nov 2016 16:57:11 +0100 Message-Id: <20161115155736.599954-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:A5qZ+wM8i5CLQKTumYDQgeDmdFeLCEWnvhCWi+GhBlfdc+snjZ+ Q6MGxVRPAq/OGJTHJNK8ZNTqATdeVrLcPFJ12aJAIJPCPzTkxpLxAQkKhQPMfofRKd7/+NC +tlIPqPz5fr1Fwz/qEVpTjlqSIyUSRdvUTKdmy1h17C5Wl+r2aU8Z7rIjx/fnvR1OR/G3tX KBuHFhSfeeH0cAM+XaRog== X-UI-Out-Filterresults: notjunk:1; V01:K0:bgqi7i2HAt8=:Z9SmEERtaRlTJko9qo1qkG TufmYNCqn4kHoNr5ZE2HeTVV9jBu/1g5bGmZsKXrv2lATV0uMomdBNvpyE4PhXQ0wYbmbxMyL fv48VgXSSbtgJFeBH4k6AqY3KjFAZtw1/IKrawMLsrV/b2FeOkpVv64DgTrLSD1ZXwVIuO3Cq dcO2h0VdZ2l+Pq9GLFVg8e9Ga7CRRQmjwVKoPQOrxw9LiSWYTIRmEXOaQNFqvc89BN0PNkl6j ztBFDnI6eiO6fyCAFeeXxhHTAeDmfxn9DTVKO/havgFhHVcaeeuN8+1gl+IL25K/kyT9bwZRG 5juWWtKktqxy7aJSHt5D5549XZgpT+13XCf1PqdauFvGgATaHUvMI/N4pLTkrJDC3i5NCiHtZ UzfUTt6kKDfpsFTJlWnbzOYBvJwipFnPVsqRUrbptmB8VOe4/RiNySy69Rrt3sZjBbDYvzJm2 qqmqWu5EOWkJlHwpR8JxTKB/JBSoEsmib9tXFKnBBKtgxV12wycRwv6P4Cs82VBJykQ6f6LgB X9ZsKpPAsqZ2nQ3HoI+g1G2YfDNQLS+LSvOEqbLcDxTn4YGMDu3JyHd0L8fT2tLPPPFJcJvto hegCR5dsGnN3Iv3gfzSOv25hkJ/22gHCUw5KEYvKGqIZzpoBiNogsGFmGV/6f0GvFkPmvNx7D 9wnRSOlpJfPrEUL7TkpSNPWW50CSoniG6Z5xE6nq2sibmWgHYK8bNn70eyNsY32yA3eI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A rework left the node pointer uninitialized when the device tree is not in use: drivers/char/tpm/tpm_of.c: In function 'read_log_of': drivers/char/tpm/tpm_of.c:37:8: error: 'np' may be used uninitialized in this function [-Werror=maybe-uninitialized] This reverts the behavior to what it should be. Fixes: 4a45d9669ac1 ("tpm: replace of_find_node_by_name() with dev of_node property") Signed-off-by: Arnd Bergmann --- drivers/char/tpm/tpm_of.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c index 3af829f3ad59..24fa6afc2e55 100644 --- a/drivers/char/tpm/tpm_of.c +++ b/drivers/char/tpm/tpm_of.c @@ -29,8 +29,7 @@ int read_log_of(struct tpm_chip *chip) struct tpm_bios_log *log; log = &chip->log; - if (chip->dev.parent->of_node) - np = chip->dev.parent->of_node; + np = chip->dev.parent->of_node; if (!np) return -ENODEV;