From nobody Tue Sep 29 02:02:24 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C001B4908A4 for ; Thu, 13 Aug 2026 15:32:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786635124; cv=none; b=VtG7/hBOqliuEpcQbXCtCEyqwKAeRH+mSlz9Ce8KHtGdkbr8RzOL5QvonQg1fTXGavCU6ovorjuksnByQAC17aZrq8qJH0o88TevxvFtR5GYPhlfK87Gpj6PAr0y8Zy+/Lsw9pK4lT+/JtA198WDEkIa5gdsodrPfOqzSe6KQrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786635124; c=relaxed/simple; bh=EN4LhodwYbuCiC5jqwsFoAkYL7S1UXvqKzFEK/fGe/M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=sygZfsicsKMj6CY1av3JgADg97F3PY37RHPEEALWzBs27DCKQZOl7UO2AzcEoXm+LTGJmee8ovNEnqpgL8rphDXQezH1phBrygWpHUG4pAPsdwtB5VYanS+x5FAk+lF+ArqBA3CtuEBit9AgC/q4IeCLGOU5LGYhITSsXe+XKdU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=czVRmL2R; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="czVRmL2R" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2cacb8416a1so780945ad.1 for ; Thu, 13 Aug 2026 08:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786635121; x=1787239921; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=eWqLatESzRUbhMgwOKx9MP14zwvcSFVaT+uWumR2dGA=; b=czVRmL2RbgiriBq82tE7k8jbmNZvPMsnSZf+N9JdvnQ3cS7ZBaXYV5artg1m+KM6I+ BX8IbC27TGhqqFWYhN7ijcpebubUX9nXikKBjkWddMhJ7qEZ0UJQU1pbP2sDeckFgUVe wBwsndFZgfGKbIzREhnsnf2x20mnnhC7ocC9AJv3Eb+OoZ8C4z42LJj+AnaKpEo3/DM1 mk1dSAxnQNLsycvAiPFTCXDLjtdv5wQMWGb0rbmoOITg1N3dmv1p3VFjYoQkv0V6Y4tX ihwcTzn6HqiQKe+oIelAIpVJduityMwQ57PPUdVG874lXs+DmJOSMUj/S4SN1E5sPHas RP6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786635121; x=1787239921; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=eWqLatESzRUbhMgwOKx9MP14zwvcSFVaT+uWumR2dGA=; b=sbQnyryRMnBQyUps4wZ1mYNnha8S+d92EF9EK1kFmpwwOK/SNAsBH6xhiQgfl7oDVS v+Mr7owZkrSX+cNtvx1c1I9drViqEP9RbbiHTjcnopO3KoaZXsVtTQNzIFTKWDM7frax i4a3mD6eCOretP70sg6m/4zErJ7fBY/6HzQ+y0Za3PvZ/tN1aDUHApSWK0X+z7uPkOhJ qKGk6fLOwzu1QhJqDuO40ue13tskJT0sTvTFSX/tUzMt0c/8SE3bj1YKwpymFrmt8MgR 4JUkl949eCdXqbiLxS+/sbkYXjMywxZvyiPKFcwODzmVhoCavlY+rI8wdMcN9rgogBzj 4Pkw== X-Forwarded-Encrypted: i=1; AHgh+Rpy9NMnp1fnvz0QazXCXN2vDMNd+SSMnrkUKV/1HyoC88LInjEx7b6NN5fJi7MD8Sq7ikf6tQOsc9bqFFM=@vger.kernel.org X-Gm-Message-State: AOJu0YzI0YpropnzvCbqq4z2z8GfrSz8CWlHRszjYQapd8/D/xV36D6D DPssusMP6PsQuVn1m9YqVWSBdpis4uwD/5mGIfRVNipTW2wOLuaEmBxS X-Gm-Gg: AR+sD13fir8Dk5cIuiO4FjWqCfSLhVr4oLtv3gOsnuamQbWppZwZl9pUS6UKruEieCV qei45Fzb0EdsLcKCqLO5odNIuKLGE26dot2yEkMzVhtiuYYiUlNoCV8206oK6zN14yWgyw/MGVS Cx131AYAIJF7s3QG8A5SaWeO00x9xdqjZEWtLv8OxfdqpSCuOvSeVHAQlIeXyVj0luHbLT+jB3/ sPvjhzvizoV7bcHpLs/QcsXV2xssI4iyddeTZlGTCBJevhrxQo7cVWSk4VPKb+1LpLW6OLXGP/x gzsEQZWWQHC4USwCtxLu7Tja+4g+3RnZJcJ+G3IsgoejD98W54FiDRY7LTDuPzu9bQj9cCucXYW B6O/y3dJFuevFOJHtmMi4g3XW6D0jogOwPgTHuL9vX4/JcpFvI603X5dKy4Olv3ukVrqfNXlmBa a6WNBcR0AZfr+sKi9e2Ayl/aeCBqezrPVEtRjfiFCGDcvsl/nOQe7n516yh2Ypz+XpoDWbTZKCO wSCmBs= X-Received: by 2002:a17:903:1ace:b0:2c0:e2ea:6b0c with SMTP id d9443c01a7336-2d37f0bf777mr84784575ad.21.1786635121472; Thu, 13 Aug 2026 08:32:01 -0700 (PDT) Received: from haichao.tail057a43.ts.net ([2001:da8:e000:1206:3b7:6da1:c188:d14f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d37c200cf3sm12030325ad.4.2026.08.13.08.31.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2026 08:32:01 -0700 (PDT) From: Ruoyu Wang To: linux-i2c@vger.kernel.org Cc: peter@korsgaard.com, andrew@lunn.ch, andi.shyti@kernel.org, jcmvbkbc@gmail.com, wsa@kernel.org, linux-kernel@vger.kernel.org, Ruoyu Wang Subject: [PATCH] i2c: ocores: Disable clock on failed resume Date: Thu, 13 Aug 2026 23:31:55 +0800 Message-ID: <20260813153155.3953577-1-ruoyuw560@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ocores_i2c_resume() enables the controller clock before reinitializing the hardware. If the clock rate changed while the device was suspended, ocores_init() may reject the resulting prescaler. The callback then returns an error with the clock still enabled, while the controller itself remains disabled. Disable and unprepare the clock when ocores_init() fails so the failed resume path balances the successful clk_prepare_enable() call. This issue was found by a static analysis checker and confirmed by manual source review. Fixes: e961a094afe0 ("i2c: ocores: add common clock support") Signed-off-by: Ruoyu Wang Reviewed-by: Max Filippov --- drivers/i2c/busses/i2c-ocores.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocore= s.c index df6ebf32d6e8f3..2d18c10358375f 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c @@ -755,7 +755,11 @@ static int ocores_i2c_resume(struct device *dev) rate =3D clk_get_rate(i2c->clk) / 1000; if (rate) i2c->ip_clock_khz =3D rate; - return ocores_init(dev, i2c); + ret =3D ocores_init(dev, i2c); + if (ret) + clk_disable_unprepare(i2c->clk); + + return ret; } =20 static DEFINE_NOIRQ_DEV_PM_OPS(ocores_i2c_pm, --=20 2.51.0