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 BD184471268; Tue, 21 Jul 2026 20:05:44 +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=1784664345; cv=none; b=dxugA9Kdk18OqHYNhbAH1dIK/C20d3BvxO/mhRg26FCo/Dyonpc/YYIJUAf0+NnrXHjjWDWniulJnEah0yerRsmIIZXlfMU9mLO3eeIdeIDQFoY7F97zwPISgpJoFShKXUAGW7HFiwdJpynDAqULXeAmIz6AY55wdP38DdU1Pwg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784664345; c=relaxed/simple; bh=suugSX7iEYgAhK1LUwUx96mnfbyxrnweVqL+ZarpNAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C/mmoKQlkFngVomsVX5Hmzdvy5HnOKZAIyqX/NG/GwMwlXqHueiwpBcFBUGomnPg4uvk1clO6nJY5lm8mvXK0Ng2W1b+6TR4CVvI7Bb5QmZTBuv7DtwD0LQclbuME0DWexpHV0gkttVmyo7jcO/x1FZDUo8UlV/goqsfIkIT/Fs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WWic4w2+; 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="WWic4w2+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D1591F000E9; Tue, 21 Jul 2026 20:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784664344; bh=HLiC+txQrd4MHuqGFQzuYu1dIXNlPb2mOuR1ZFIuCiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WWic4w2+BZ0oOtR+qYDF0anY2p1xqmHrdcOWQQswBtVjhgQAkGo1A44w9rbFE6V9Y t2Kr6M/6N6D3Lc61TkR2N1Dbp+/tvap3XhVNwO6ocpv+7NosdowGCuEAqrQcCFr2pY 2U5fXbhSnoNMLbO29ENiO5REBAT2LnhLmjqOzNsI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Frank Li , Laurent Pinchart , Hans Verkuil , Sasha Levin Subject: [PATCH 6.12 1166/1276] media: nxp: imx8-isi: use devm_pm_runtime_enable() to simplify code Date: Tue, 21 Jul 2026 17:26:49 +0200 Message-ID: <20260721152512.113852379@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Frank Li [ Upstream commit 078161dd44d6f848a62a473206d69025607736ec ] Use devm_pm_runtime_enable() to simplify code. Change to use dev_err_probe() because previous goto change to return. No functional change. Signed-off-by: Frank Li Reviewed-by: Laurent Pinchart Link: https://patch.msgid.link/20260116-cam_cleanup-v4-2-29ce01640443@nxp.com Signed-off-by: Laurent Pinchart Signed-off-by: Hans Verkuil Stable-dep-of: b670bf89824e ("media: nxp: imx8-isi: Fix use-after-free on remove") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c @@ -472,13 +472,14 @@ static int mxc_isi_probe(struct platform return ret; } - pm_runtime_enable(dev); + ret = devm_pm_runtime_enable(dev); + if (ret) + return ret; ret = mxc_isi_crossbar_init(isi); - if (ret) { - dev_err(dev, "Failed to initialize crossbar: %d\n", ret); - goto err_pm; - } + if (ret) + return dev_err_probe(dev, ret, + "Failed to initialize crossbar\n"); for (i = 0; i < isi->pdata->num_channels; ++i) { ret = mxc_isi_pipe_init(isi, i); @@ -501,8 +502,7 @@ static int mxc_isi_probe(struct platform err_xbar: mxc_isi_crossbar_cleanup(&isi->crossbar); -err_pm: - pm_runtime_disable(isi->dev); + return ret; } @@ -521,8 +521,6 @@ static void mxc_isi_remove(struct platfo mxc_isi_crossbar_cleanup(&isi->crossbar); mxc_isi_v4l2_cleanup(isi); - - pm_runtime_disable(isi->dev); } static const struct of_device_id mxc_isi_of_match[] = {