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 A19181A6191; Tue, 30 Jul 2024 16:13:21 +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=1722356001; cv=none; b=ZmX3bYSD8y92r+aNyhmtIdNBKTnBniVqm8+gqfXuBZg99E0cDbry6vyHfGFCF6qwa26r5J1Sifl8dC8ZHb7w/GMZG+mGRn3BvBceXJBmJ5K8VKBB+XJnhqICBluBVU/rGTTI/W+Q1ULxhIOWMZpvTosk0SLaUKT4GOMBfPTFXXw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722356001; c=relaxed/simple; bh=petmXTq+DSxKS+8K6lY9g35x8G7yTTTr1TTHBPnL/Eg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HiCrT0mNb47N6dMEEUHkmGX/DO6AjhB1/G+j4wcCSUGQrU69C2dnnaIq9Gf3j4tKfCpCNVZuSVrMCgbPQrGi6eIeSLqT24jcepwacOXYVCdv20lrK64+axZ5wv+4vE2BMt80YC3hVMPWLm5RqkZ85v797wfz8SFFThhKyjSDpHA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zpWEBMnT; 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="zpWEBMnT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26321C32782; Tue, 30 Jul 2024 16:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722356001; bh=petmXTq+DSxKS+8K6lY9g35x8G7yTTTr1TTHBPnL/Eg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zpWEBMnTuPzP/jqe7V81qkL1zWbonTQH7m3WZuQin/Pr4q4pcil7aAn92Mvr4U+wI fRO3lEt0EG6/j0JVXulGfn6pPrgmqSi29sDQFesFCAGxy9WxBd+o6v0ZjqkmuJP8qA NlIDN8cMLy9yhV9OL2Sm8RmcMu0FD2NdIjNrAgYg= 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.1 147/440] media: rcar-csi2: Disable runtime_pm in probe error Date: Tue, 30 Jul 2024 17:46:20 +0200 Message-ID: <20240730151621.621913140@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151615.753688326@linuxfoundation.org> References: <20240730151615.753688326@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.1-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 174aa6176f540..001c4b7c59758 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c @@ -1559,12 +1559,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