From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3ADB3C10F14 for ; Thu, 18 Apr 2019 18:19:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0267B20675 for ; Thu, 18 Apr 2019 18:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555611550; bh=ZObmM1XzK+zWcXPLL2bsqkgrYt+3yMH/6KbpDD5u7Y4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0OJnrmAwQK+T/6C8qLerUf2w+mlmRHJsLP18WiyQJXQwnXmlMF/7oh8LViW2i2/z4 75RwTGMmABMk5wWrKV6VpCtqnYSGcp1GGjd7oejjrx9Wlr6IQYICfxRX8YJR0r6SKR GxbYkjoEDhOivbR5pBtBtQJOwvIh/6ql0T3zu0+g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391926AbfDRSTJ (ORCPT ); Thu, 18 Apr 2019 14:19:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:41754 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403942AbfDRSKD (ORCPT ); Thu, 18 Apr 2019 14:10:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7EEB320675; Thu, 18 Apr 2019 18:10:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555611003; bh=ZObmM1XzK+zWcXPLL2bsqkgrYt+3yMH/6KbpDD5u7Y4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TSGDwHYbHavNk19WrnGBqA8o4JjRANNUh6j1KV88ikJYjCb66fPRgey0JmhWI8q2+ bma9RpxrLOrewCNQD/+D7fm/JxZMgMeDUUXR4nYTmcXdEsM5Wn98gyzuSiz22Jtyye PJfc84Xg9PB1utxELRLasAVzTpFMcbGRk+lKClS4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marian Mihailescu , Marek Szyprowski , Krzysztof Kozlowski , Zhang Rui , Sasha Levin Subject: [PATCH 5.0 21/93] thermal: samsung: Fix incorrect check after code merge Date: Thu, 18 Apr 2019 19:56:59 +0200 Message-Id: <20190418160438.906381680@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160436.781762249@linuxfoundation.org> References: <20190418160436.781762249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 3b5236cc5d086dd3ddd01113ee9255421aab9fab ] Merge commit 19785cf93b6c ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal") broke the code introduced by commit ffe6e16f14fa ("thermal: exynos: Reduce severity of too early temperature read"). Restore the original code from the mentioned commit to finally fix the warning message during boot: thermal thermal_zone0: failed to read out thermal zone (-22) Reported-by: Marian Mihailescu Signed-off-by: Marek Szyprowski Fixes: 19785cf93b6c ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal") Reviewed-by: Krzysztof Kozlowski Signed-off-by: Zhang Rui Signed-off-by: Sasha Levin --- drivers/thermal/samsung/exynos_tmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 48eef552cba4..fc9399d9c082 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -666,7 +666,7 @@ static int exynos_get_temp(void *p, int *temp) struct exynos_tmu_data *data = p; int value, ret = 0; - if (!data || !data->tmu_read || !data->enabled) + if (!data || !data->tmu_read) return -EINVAL; else if (!data->enabled) /* -- 2.19.1