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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 7C34EC433DF for ; Tue, 9 Jun 2020 01:07:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46B8020842 for ; Tue, 9 Jun 2020 01:07:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591664838; bh=Ye++hxdlWa+ti5cA5JE7quOuxtmeHQDjYv35mFH/6fs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f9gmlK7/O5ppuyO3rljQQsn86qyohh2WoQvigez/zG9Ij4lWhp4BieZy6kv8ZBFLv dhBfWq7rtKDD68/7PRcTKpHARbJTyJHPp9dfTpUGifejv1EfrfknY/KKiUDYXPXaVd fRsPhydflk/Xj2eMHt2c1ollgy5aYrSF29ljlCbA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729075AbgFIBHQ (ORCPT ); Mon, 8 Jun 2020 21:07:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:50676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727773AbgFHXHC (ORCPT ); Mon, 8 Jun 2020 19:07:02 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ACE4B20820; Mon, 8 Jun 2020 23:07:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657622; bh=Ye++hxdlWa+ti5cA5JE7quOuxtmeHQDjYv35mFH/6fs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vJcM0gWsbh/IilrRp8zLxTn1fhb8G6TK8fv18c/cI38d7I0SaZGIPaXfRJY/NtYpc w4QG9+YgnOzvbQJWsQVpWK7To0iyNjGi7pvRbwUtu2jJff6mQqHD2lsf3O5YftX3c4 cxD7hjC2A5gKhOm4e7LSamjThk/tH8e4LKM23n/8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mattia Dongili , Dominik Mierzejewski , Andy Shevchenko , Sasha Levin , platform-driver-x86@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 043/274] platform/x86: sony-laptop: Make resuming thermal profile safer Date: Mon, 8 Jun 2020 19:02:16 -0400 Message-Id: <20200608230607.3361041-43-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mattia Dongili [ Upstream commit 476d60b1b4c8a2b14a53ef9b772058f35e604661 ] The thermal handle object may fail initialization when the module is loaded in the first place. Avoid attempting to use it on resume then. Fixes: 6d232b29cfce ("ACPICA: Dispatcher: always generate buffer objects for ASL create_field() operator") Reported-by: Dominik Mierzejewski Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207491 Signed-off-by: Mattia Dongili Signed-off-by: Andy Shevchenko Signed-off-by: Sasha Levin --- drivers/platform/x86/sony-laptop.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 51309f7ceede..e4ef3dc3bc2f 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -2295,7 +2295,12 @@ static void sony_nc_thermal_cleanup(struct platform_device *pd) #ifdef CONFIG_PM_SLEEP static void sony_nc_thermal_resume(void) { - unsigned int status = sony_nc_thermal_mode_get(); + int status; + + if (!th_handle) + return; + + status = sony_nc_thermal_mode_get(); if (status != th_handle->mode) sony_nc_thermal_mode_set(th_handle->mode); -- 2.25.1