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 55CD846EF79; Tue, 21 Jul 2026 18:44:54 +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=1784659495; cv=none; b=Jn7ZE4Gu77mWfUdxVK5BZ40xoAk8bVjITxjUY0twV/RSs/Ek59IDy/oKuK+d5ulqzb/QHFUJ4IXaI2WQg2X0M074A8Mx1BaCkSdthskK6HvvqmXpABG5xJQB5aIWc9jezr07Ut/ExhNjfzZhGjI7OWvf4XtWeFYT2mj6LwXk4HA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784659495; c=relaxed/simple; bh=ZpymR5YEKn+NWsOJplksr0gMHK3udy+1VJXjlinzgBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KYAfxJqS0RgKJSC1btz77a9YMyTTRj5NRFE2ch8WgrgnWQ1WOs6E4fI3v304d3GogWdjNkLLzE7xoX3DaJy/BhIDj7JQrx38bgnaTUOl4SmT+9b/oZ+GjyjZuZ4KUMu3RSPaqK8ezeW2xrCxekaOwhIAPY2vswfM7iZOUa1oeNo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=clVJhP1W; 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="clVJhP1W" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBFBE1F00A3A; Tue, 21 Jul 2026 18:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784659494; bh=bvHrvbGJNW572a4UfcTfvcP+2Igsq0D/jUAOk639qsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=clVJhP1WtWCpJlboWbJj8gINiemw/X+2woQRIfwXIdkzoqmiycdFO6KnRlUOH0rla pe4NNskKfOnmQN2qgJya2dNZJNQS+RvJLrYFrqBEzPU0UhOAe7kzrrG6bcvMehUPQd Ywa22fvry4KW5o4LcmSeFWUJmZ6a0Aspoj3WMS8M= 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.18 1543/1611] media: nxp: imx8-isi: use devm_pm_runtime_enable() to simplify code Date: Tue, 21 Jul 2026 17:27:39 +0200 Message-ID: <20260721152550.153870756@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@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.18-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 @@ -488,13 +488,14 @@ static int mxc_isi_probe(struct platform dma_size = isi->pdata->has_36bit_dma ? 36 : 32; dma_set_mask_and_coherent(dev, DMA_BIT_MASK(dma_size)); - 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); @@ -517,8 +518,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; } @@ -537,8 +537,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[] = {