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 B01D6155CB3; Tue, 30 Jul 2024 16:30:10 +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=1722357010; cv=none; b=ea5xRlHO0UmPcQkCQRxUEe1dxtp1Z97XqTRn77GsxvnO5JNLnoxuVwareirkipfzubG8004xhJ2NdFryKf1hnsc+9m1cVXwDlZgPWkiOlYPiARPzMkSM93O6JM5S3awzDHPHofijSMVSo4zSYNY3yhB2u9ZmGvS5UR3wGSSir7g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722357010; c=relaxed/simple; bh=Vfq6iTmr72NoPoDuHlKmqU7G/loU23rg1s86HH9ku7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DPQyo5l9Uy6WEDWqMXQ+gEYfGWO5UpWRbynmTXdpm2K8IrSXWansr2pBUSQYL/dJ5/ZMBrLIU36u/Sca00SoYcqlAfLWWDKoECf7LqsB+HAK7poP+hpVi8+tcsBtueihasHanzVuZt0Zs+tgtnNlD/gRCddDHhsoBO7iAu9ya5k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kWiG3Bp0; 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="kWiG3Bp0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21151C32782; Tue, 30 Jul 2024 16:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722357010; bh=Vfq6iTmr72NoPoDuHlKmqU7G/loU23rg1s86HH9ku7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kWiG3Bp0Rky9sonrFU1MllUviEMIZanWmvqAVvtVMQXgHeLSAjoCKsKxKmEqTJ/M2 RcQJQ3sqb1JTHOD870qDsZBSXP2oAHJ220LHJ92H0vZ8UJvzXXm8xSMLjur3jup7tf er4qWJGAOiTbRWgMZFqbYWVC+wjOb8k3Sk0V5Lig= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jacopo Mondi , Laurent Pinchart , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Sasha Levin Subject: [PATCH 6.6 209/568] media: rcar-csi2: Disable runtime_pm in probe error Date: Tue, 30 Jul 2024 17:45:16 +0200 Message-ID: <20240730151648.043893758@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151639.792277039@linuxfoundation.org> References: <20240730151639.792277039@linuxfoundation.org> User-Agent: quilt/0.67 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jacopo Mondi [ Upstream commit e306183628f7c2e95f9bf853d8fcb86288f606de ] Disable pm_runtime in the probe() function error path. Fixes: 769afd212b16 ("media: rcar-csi2: add Renesas R-Car MIPI CSI-2 receiver driver") Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Tested-by: Niklas Söderlund Link: https://lore.kernel.org/r/20240617161135.130719-3-jacopo.mondi@ideasonboard.com Signed-off-by: Laurent Pinchart Signed-off-by: Sasha Levin --- drivers/media/platform/renesas/rcar-vin/rcar-csi2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c index f6326df0b09be..2fc15882a6976 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c @@ -1914,12 +1914,14 @@ static int rcsi2_probe(struct platform_device *pdev) ret = v4l2_async_register_subdev(&priv->subdev); if (ret < 0) - goto error_async; + goto error_pm_runtime; dev_info(priv->dev, "%d lanes found\n", priv->lanes); return 0; +error_pm_runtime: + pm_runtime_disable(&pdev->dev); error_async: v4l2_async_nf_unregister(&priv->notifier); v4l2_async_nf_cleanup(&priv->notifier); -- 2.43.0