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 58BE925EFB3; Tue, 11 Mar 2025 15:22:20 +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=1741706540; cv=none; b=qZlD9D8+nOs3WsulNjEl3IbqauSfMMEA6xJz0/sfa2qm5q4sq0mhROliC/I7OEvAlAn7HhKMmtfzTG86utjW1OFxof5RWY3WRlq5Yams4kKtPaHUdM1voLfv7xolNz5faToftDzaOsSejTKP12zuNnLfxaCFW/hGoHjcgTq7irQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706540; c=relaxed/simple; bh=7bWmn/sJ8WxLimrvTnHmUjTIP6sjvbNBshDiwuUDX2s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ah6GY2T5x78ntRoG78ZuCNd997l5O3m1U3MOC2wRPKWd1V3cdudxbPQ1MbCydf+MRPY6yAy+WuSTgXp2KwiDRYa1cNPC2IvsPrdYnbQ2bqDa+xEgrJYIROUgcsBKz0bwsW235lRTqeLMJqSFqqL+5GgK6Fjg0n7hRMldOQJndGA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RR21zUCq; 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="RR21zUCq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB55DC4CEE9; Tue, 11 Mar 2025 15:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741706540; bh=7bWmn/sJ8WxLimrvTnHmUjTIP6sjvbNBshDiwuUDX2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RR21zUCqzzB7npqs6AKmpCCqZJ5NC3qZQLu6qhEY61JTzUgH18Q7+3eKjOmZ4tebf 0BmNUf7a52kUEAb8rv9tO0ummmdVR2doLejnV6htuuyTu3JpqaPWqgzHkDcXb7GT44 s7lHwOVzw8a/ryFuV7hpZg00FsUr0o4oFXEKREY8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiasheng Jiang , Krzysztof Kozlowski , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.10 084/462] media: mipi-csis: Add check for clk_enable() Date: Tue, 11 Mar 2025 15:55:50 +0100 Message-ID: <20250311145801.671200123@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311145758.343076290@linuxfoundation.org> References: <20250311145758.343076290@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiasheng Jiang [ Upstream commit 125ad1aeec77eb55273b420be6894b284a01e4b6 ] Add check for the return value of clk_enable() to gurantee the success. Fixes: b5f1220d587d ("[media] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI receivers") Signed-off-by: Jiasheng Jiang Reviewed-by: Krzysztof Kozlowski Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/exynos4-is/mipi-csis.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c index ebf39c8568943..e6c86ba30fa32 100644 --- a/drivers/media/platform/exynos4-is/mipi-csis.c +++ b/drivers/media/platform/exynos4-is/mipi-csis.c @@ -939,13 +939,19 @@ static int s5pcsis_pm_resume(struct device *dev, bool runtime) state->supplies); goto unlock; } - clk_enable(state->clock[CSIS_CLK_GATE]); + ret = clk_enable(state->clock[CSIS_CLK_GATE]); + if (ret) { + phy_power_off(state->phy); + regulator_bulk_disable(CSIS_NUM_SUPPLIES, + state->supplies); + goto unlock; + } } if (state->flags & ST_STREAMING) s5pcsis_start_stream(state); state->flags &= ~ST_SUSPENDED; - unlock: +unlock: mutex_unlock(&state->lock); return ret ? -EAGAIN : 0; } -- 2.39.5