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 E2B3D43DA4B; Thu, 20 Aug 2026 16:41:30 +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=1787244092; cv=none; b=hAPv6HCw4uDTgnUeUbS3po5h5OQacFbFMKnoz3CN/44zqXHWZZ8QUVaenlL6H2p3Hxwutyj1q4OAGnsmx4o9JQQaeLjdCASkrVGCV7XWsVsk08cZGeaYsHavY2x+LgXvnC1z+B1CmJeQpR5XQb0XWWTn93G2qxzjQyuW8f7npL8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787244092; c=relaxed/simple; bh=S56XP9IKDvqKPmY7DZR93MRBxpS/64LbJdgQatNBUUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ig/IaZ3b0pc/F3bn/8ra+wSVpJdhsy1t2n67eOU+jp9wstwrlFuNPYlqdOTFyzc4990OhNB/syVxPAoml04YK62hNa9yC/ZqMTZp9MF94LkHDzeuADLwV0TrMSOVaLJgajEMlDHHYq0NenBfbpWFnsKWv7Dxc2HUvMcDM0AderY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x6/CKLF7; 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="x6/CKLF7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 488701F00A3A; Thu, 20 Aug 2026 16:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787244090; bh=6xGjRKV2GghhPZ4C35oQIuBH5HdIXl2TsnrIsUPo80w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=x6/CKLF7UlpjXkIkPuw13nopY8ZkT7zH5SZoakjq8BMWxKP6sP3GVw9vk9YjVX66U 6AW+obqLUKGmC0aLUUJOhmBnSsEvLhz8k3PVRFozCUpQRFPcIR6MbdhkmVuH2rVwtd Mug16r4/Zv7Y6xal2hokF2byake+UlUBCOUSvFDA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , Bartosz Golaszewski , Andi Shyti , Sasha Levin Subject: [PATCH 5.10 047/235] i2c: davinci: Unregister cpufreq notifier on probe failure Date: Thu, 20 Aug 2026 16:54:43 +0200 Message-ID: <20260820145217.860452360@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145216.426568665@linuxfoundation.org> References: <20260820145216.426568665@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li [ Upstream commit e43f32816a1b1fe5a86279411626fe3a9be56d45 ] davinci_i2c_probe() registers a cpufreq transition notifier before adding the I2C adapter. If i2c_add_numbered_adapter() fails, the probe error path releases the device resources without unregistering the notifier. Add a dedicated error path to unregister the cpufreq notifier after i2c_add_numbered_adapter() fails. Fixes: 82c0de11b734 ("i2c: davinci: Add cpufreq support") Signed-off-by: Haoxiang Li Cc: # v2.6.36+ Reviewed-by: Bartosz Golaszewski Signed-off-by: Andi Shyti Link: https://lore.kernel.org/r/20260610030513.2651018-1-haoxiang_li2024@163.com Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-davinci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c @@ -877,13 +877,15 @@ static int davinci_i2c_probe(struct plat adap->nr = pdev->id; r = i2c_add_numbered_adapter(adap); if (r) - goto err_unuse_clocks; + goto err_cpufreq; pm_runtime_mark_last_busy(dev->dev); pm_runtime_put_autosuspend(dev->dev); return 0; +err_cpufreq: + i2c_davinci_cpufreq_deregister(dev); err_unuse_clocks: pm_runtime_dont_use_autosuspend(dev->dev); pm_runtime_put_sync(dev->dev);