From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF1E4345EA7; Sat, 12 Sep 2026 15:49:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789228181; cv=none; b=LwMt9DAPoZUg0etcRuxZeh8ZEWZLjptOJ05mjrQNdwlIgLO6+ujwMlSmokDD9mLTiVFNVE1pr2g7EoH0a3aeknC7BrkUz6nwIK10urS+3nKoQk/C7QGeZYSBDsbJCrOp6L/Us0yZzYt3Az2yGLzMoF9xieDZwEZ+g4BTrdwyPd0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789228181; c=relaxed/simple; bh=c/XkHbyFuBhLK1+BsHOqooJX/mVCL/Hledkig/0BHzU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p/qQQQs0XD5Vpc7Cio8ImIrtJcyFTopQpGMZaPzyE0aHr+PBFOsm0HFWlMBeXztCmrXdlYQtFvh4qIVwGwDuj7/PVLa8v5Ve5jXEjEYme0GyUbZgL+ECRmay4j0Vrh+ybi7k4uKrI49KjAVTnRiEvUfJ5v2o+7lnG3ICelNHCB4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eznbJQOs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eznbJQOs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C97B1F000FF; Sat, 12 Sep 2026 15:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789228180; bh=qbMif1ONbX93ks83SQl+Vr+xcHx0hmAcmiIUZxV4gDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eznbJQOs/cLOpK2W5Ijc9XOnRKi2EkY1rRmzjpgvYH1f6boM6C19b+42TLlyZ9D2S LOWYGi1tocrIpqlV0AICxOyh8OCOmxseZ6BLIlqXubxDvl1C95y06WoN7qL+kpNiAq i4IJSBWMbGKx6z1Ef0nXICtyC8FFzAlrSrr5STkE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Can Peng , Daniel Lezcano Subject: [PATCH 6.1 0281/1191] thermal/drivers/qoriq: Disable clock on resume failure Date: Sat, 12 Sep 2026 08:50:09 +0200 Message-ID: <20260912065554.537961403@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Can Peng commit fcbf9964b67a6d6704c50ed28daa24c3b164f01c upstream. qoriq_tmu_resume() enables the TMU clock before clearing the power-down bit and enabling monitoring. If either register update fails, the function returns with the clock still enabled. This leaves the clock enable count unbalanced after a failed resume. Disable the clock on those failure paths before returning the error. Fixes: 51904045d4aa ("thermal: qoriq: Add clock operations") Cc: stable@vger.kernel.org Signed-off-by: Can Peng Signed-off-by: Daniel Lezcano Link: https://patch.msgid.link/20260722075625.452684-1-pengcan@kylinos.cn Signed-off-by: Greg Kroah-Hartman --- drivers/thermal/qoriq_thermal.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -369,11 +369,20 @@ static int __maybe_unused qoriq_tmu_resu if (data->ver > TMU_VER1) { ret = regmap_clear_bits(data->regmap, REGS_TMR, TMR_CMD); if (ret) - return ret; + goto disable_clk; } /* Enable monitoring */ - return regmap_update_bits(data->regmap, REGS_TMR, TMR_ME, TMR_ME); + ret = regmap_update_bits(data->regmap, REGS_TMR, TMR_ME, TMR_ME); + if (ret) + goto disable_clk; + + return 0; + +disable_clk: + clk_disable_unprepare(data->clk); + + return ret; } static SIMPLE_DEV_PM_OPS(qoriq_tmu_pm_ops,