From patchwork Tue Jan 22 15:47:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 10775841 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A404717F0 for ; Tue, 22 Jan 2019 15:47:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94F7B2B147 for ; Tue, 22 Jan 2019 15:47:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88C792B160; Tue, 22 Jan 2019 15:47:50 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable 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 368172B159 for ; Tue, 22 Jan 2019 15:47:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728721AbfAVPrt (ORCPT ); Tue, 22 Jan 2019 10:47:49 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:56841 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728669AbfAVPrt (ORCPT ); Tue, 22 Jan 2019 10:47:49 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20190122154747euoutp01101a1ed74391d2a4e1905b1b6c977fd5~8NksAqWJc2008820088euoutp01f; Tue, 22 Jan 2019 15:47:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20190122154747euoutp01101a1ed74391d2a4e1905b1b6c977fd5~8NksAqWJc2008820088euoutp01f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1548172067; bh=oekNfPbTnvkOjXcc6COSXS6vrwsjWrtgg0S6rZvND9c=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=VjNbpjhnY4Zpaz6+/x2L57JYf3pvX4OcWalnhjdPRadef+Cp++D+VjyKogIRY9OOA /hpNsxY6bzNgE9G6LZoXPVG6wDzr/+pEoIzd/i+fblS/JKgyLDNbMDXjXiq0mdGDC1 a+mjUqFNSUmLphkt65huT2DnFLSyu7FT3PrDdnzs= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190122154746eucas1p24237cdd0129215bf2ad918bd42441234~8NkrWED9V1258312583eucas1p2M; Tue, 22 Jan 2019 15:47:46 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 98.0C.04294.22B374C5; Tue, 22 Jan 2019 15:47:46 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190122154746eucas1p2f6771d6928544de588877bfa946add9a~8NkqwqWKf1258412584eucas1p2M; Tue, 22 Jan 2019 15:47:46 +0000 (GMT) X-AuditID: cbfec7f4-84fff700000010c6-c9-5c473b22d296 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 58.FB.04284.22B374C5; Tue, 22 Jan 2019 15:47:46 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PLQ00BTRP7IQB30@eusync4.samsung.com>; Tue, 22 Jan 2019 15:47:45 +0000 (GMT) From: Marek Szyprowski To: linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org Cc: Marek Szyprowski , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Eduardo Valentin , Daniel Lezcano , Zhang Rui , Marian Mihailescu Subject: [PATCH v2] thermal: samsung: Fix incorrect check after code merge Date: Tue, 22 Jan 2019 16:47:41 +0100 Message-id: <20190122154741.31767-1-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190122131847.7508-1-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsWy7djP87pK1u4xBu+6tS02zljPajHvs6zF /CvXWC3On9/AbvG59wijxYzz+5gs1h65y26xftpPVosnD/vYHDg9ds66y+6xeM9LJo9NqzrZ PO5c28Pm0bdlFaPH501yAWxRXDYpqTmZZalF+nYJXBk9uy+wFTzhqtg6cTprA+M8zi5GTg4J AROJc4s2M3cxcnEICaxglGieM5UNwvnMKHG+9QQzTNXVPc9YIBLLGCWWnZnFCOE0MEnsmnqO FaSKTcBQouttFxuILSJgL3H7yTJ2kCJmga1MEve/XwVLCAt4SUz8exBsLIuAqsSTfbPBbF4B W4kXH/6zQayTl1i94QBYnBMofvfXbrADJQTmsEl8fbYFaDUHkOMi8WFrFkS9jERnx0EmiJpm Ron2GbPYIZweRomtc3ZATbWWOHz8ItipzAJ8EpO2TWeGGMQr0dEmBGF6SOzazg/x2QRGiWc9 p5mB1AJGhlWM4qmlxbnpqcVGeanlesWJucWleel6yfm5mxiBcXj63/EvOxh3/Uk6xCjAwajE w/vDzD1GiDWxrLgy9xCjBAezkgiv60W3GCHelMTKqtSi/Pii0pzU4kOM0hwsSuK81QwPooUE 0hNLUrNTUwtSi2CyTBycUg2MAZXaZwX+TEk8l99uNNXlyuXmrDidlOXXXBrM+5ZyXJpQwHT8 QOMKg9jixq5dhn83GvGY+ZyQ+XI6R6GuM09PXOzzgopDE2WDI09NqT7ttzjy4ssLzgGxdcu/ iORdOfuw7XzLFUYfl1KNlAWFsVM53coub3WcEjVvXsmT56/vH5XnCKzvrrqgxFKckWioxVxU nAgAeH1zvr8CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGLMWRmVeSWpSXmKPExsVy+t/xa7pK1u4xBu9mM1psnLGe1WLeZ1mL +VeusVqcP7+B3eJz7xFGixnn9zFZrD1yl91i/bSfrBZPHvaxOXB67Jx1l91j8Z6XTB6bVnWy edy5tofNo2/LKkaPz5vkAtiiuGxSUnMyy1KL9O0SuDJ6dl9gK3jCVbF14nTWBsZ5nF2MnBwS AiYSV/c8Y+li5OIQEljCKPHr8Q1WCKeJSeJ880YWkCo2AUOJrrddbCC2iIC9xO0ny9hBipgF tjNJ/F/0ghEkISzgJTHx70FmEJtFQFXiyb7ZYDavgK3Eiw//2SDWyUus3nAALM4JFL/7azeY LSRgI/G4YzLzBEaeBYwMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQJDa9uxn5t3MF7aGHyI UYCDUYmH94eZe4wQa2JZcWXuIUYJDmYlEV7Xi24xQrwpiZVVqUX58UWlOanFhxilOViUxHnP G1RGCQmkJ5akZqemFqQWwWSZODilGhi1jpQ2v79hy13L1W5ikvYojG3tW51M7d5r9wpK0v7u 3LrUUM6cWbqZ6XEN54c8jyfqE5Veb5fTvqe82I3fkFNK5aPORw0n4TfCF0oPPPpXd2qb66Gk 9NqzT6dtnf2nKcg+3FFs4wtu59ubZY5ufr7hstrGCWUbdOx3tblyC07V+rPsr/0bYx0lluKM REMt5qLiRADFRUpiKQIAAA== X-CMS-MailID: 20190122154746eucas1p2f6771d6928544de588877bfa946add9a CMS-TYPE: 201P X-CMS-RootMailID: 20190122154746eucas1p2f6771d6928544de588877bfa946add9a References: <20190122131847.7508-1-m.szyprowski@samsung.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Changelog: v2: - added reviewed-by tag, fixed mail addresses --- 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) /*