From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B05E045948 for ; Mon, 21 Jul 2025 09:24:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753089890; cv=none; b=D8AVvws592uB3trNbxgcW+AG+OrA12ZimWGXA2uprKySIomz4KcCevx1UL3P3aPjCTKkQ4JYw98BG3mkpgLZ0lckoNKVVwNRg0WR1EBfIW/PiHWQMSFoe4fOkMGmKrYcxHWlOciLjXwzYA4AA/oJ4ePbOkXveHQ/famddHlHf8c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753089890; c=relaxed/simple; bh=2vivxka3jjtJdTUa7kGdCWNaIzWRNWwHTrjBCuNBD6g=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=l+d5yHxvTQ4w6dMxJuKfcUIrmWL6yKYoXslSm7jLYmw+vFa+Pn5WGt4Qor86MVAnhFKRKavxABQwXdFyyQsVNtzyUytjQnWEWFi16+inSt8wwIlWAZ/4fCZ+Ylvj1gx+L62e/mX8SzjczoAJLCePKsRPUGNZt6BCjtLg/py6hXE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mryh7/x2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mryh7/x2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6DEFC4CEED; Mon, 21 Jul 2025 09:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1753089890; bh=2vivxka3jjtJdTUa7kGdCWNaIzWRNWwHTrjBCuNBD6g=; h=Subject:To:Cc:From:Date:From; b=mryh7/x2hm22wW2OeU1ABiGMBh73STESqGs1yvraOq47+iEAf0r5gCT08LDHpn7GE PS0iT3N9lxNuEnGStw2ZtXWRg1mLiHrjWVhVdIJSZov1SOaPKe8w5+W/wRbKdNYswR 84j7QPwhTQdi8BHhzKcwVJbst8B2F5puPa0cTnrw= Subject: FAILED: patch "[PATCH] i2c: omap: Fix an error handling path in omap_i2c_probe()" failed to apply to 6.6-stable tree To: christophe.jaillet@wanadoo.fr,andi.shyti@kernel.org,stable@vger.kernel.org Cc: From: Date: Mon, 21 Jul 2025 11:24:30 +0200 Message-ID: <2025072130-usher-blade-99e6@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 60c016afccac7acb78a43b9c75480887ed3ce48e # git commit -s git send-email --to '' --in-reply-to '2025072130-usher-blade-99e6@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 60c016afccac7acb78a43b9c75480887ed3ce48e Mon Sep 17 00:00:00 2001 From: Christophe JAILLET Date: Sat, 5 Jul 2025 09:57:38 +0200 Subject: [PATCH] i2c: omap: Fix an error handling path in omap_i2c_probe() If an error occurs after pm_runtime_use_autosuspend(), a corresponding pm_runtime_dont_use_autosuspend() should be called. In case of error in pm_runtime_resume_and_get(), it is not the case because the error handling path is wrongly ordered. Fix it. Fixes: 780f62974125 ("i2c: omap: fix reference leak when pm_runtime_get_sync fails") Signed-off-by: Christophe JAILLET Cc: # v5.13+ Signed-off-by: Andi Shyti Link: https://lore.kernel.org/r/af8a9b62996bebbaaa7c02986aa2a8325ef11596.1751701715.git.christophe.jaillet@wanadoo.fr diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 17db58195c06..5fcc9f6c33e5 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1521,9 +1521,9 @@ omap_i2c_probe(struct platform_device *pdev) if (omap->mux_state) mux_state_deselect(omap->mux_state); err_put_pm: - pm_runtime_dont_use_autosuspend(omap->dev); pm_runtime_put_sync(omap->dev); err_disable_pm: + pm_runtime_dont_use_autosuspend(omap->dev); pm_runtime_disable(&pdev->dev); return r;