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 36EA2189B9D; Wed, 5 Feb 2025 14:52:54 +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=1738767175; cv=none; b=kytGJpfC0ck98MYVB2LZoprrAKzGCk1IY4+d2YJzbK4WS7VSgjY1SRqp+aWxuW/IxWJB14GcJ1uLZoxIelogPkxtunEVL9lamtcHBN85tMYt6q21WGN9BMmuSs6bnDH8u9XJRZlubw0FydrMUeOej/1JjM5PUCZN5pQ7KiSHBSk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738767175; c=relaxed/simple; bh=pzKsaQyFwi+kIo4dFquQn5/taMD4vdlk0+wq0l8ivOU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dWMMEhGuL4vcUjzYeIdRyv1oXtEYIX88nRTrrPq3TpUefdEK80wJGobbOlOsOK+3WsSzhJRvCgFjbDjyIj276GlNy709mqAxOEf76stR2M9QO7ffKr2L5B1nXwPkN+zdKdxW9WjTiYL7DGlwTElAmR4MSn5o3BQlRCu0wdowNMM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SI79K5Rn; 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="SI79K5Rn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B6B5C4CED6; Wed, 5 Feb 2025 14:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738767174; bh=pzKsaQyFwi+kIo4dFquQn5/taMD4vdlk0+wq0l8ivOU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SI79K5RnNIdNjHHBSH+YgPW1kb2HZwzit/efZZAUW8o5Xz4DJzrHgTVYCXwzYo5Fm ON6qKzNtCHa9uZ8yee+3yo0j+iFO8n3JV8bYjrrB0Bz9lPd+6O6FG0Jm0WakC1SWwY 5ofuRi9smG/wf5dxf9mUufd2wSJCN2onVtdpFciQ= 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 6.12 416/590] media: camif-core: Add check for clk_enable() Date: Wed, 5 Feb 2025 14:42:51 +0100 Message-ID: <20250205134511.180212689@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@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 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiasheng Jiang [ Upstream commit 77ed2470ac09c2b0a33cf3f98cc51d18ba9ed976 ] Add check for the return value of clk_enable() to gurantee the success. Fixes: babde1c243b2 ("[media] V4L: Add driver for S3C24XX/S3C64XX SoC series camera interface") 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 --- .../media/platform/samsung/s3c-camif/camif-core.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/samsung/s3c-camif/camif-core.c b/drivers/media/platform/samsung/s3c-camif/camif-core.c index e4529f666e206..8c597dd01713a 100644 --- a/drivers/media/platform/samsung/s3c-camif/camif-core.c +++ b/drivers/media/platform/samsung/s3c-camif/camif-core.c @@ -527,10 +527,19 @@ static void s3c_camif_remove(struct platform_device *pdev) static int s3c_camif_runtime_resume(struct device *dev) { struct camif_dev *camif = dev_get_drvdata(dev); + int ret; + + ret = clk_enable(camif->clock[CLK_GATE]); + if (ret) + return ret; - clk_enable(camif->clock[CLK_GATE]); /* null op on s3c244x */ - clk_enable(camif->clock[CLK_CAM]); + ret = clk_enable(camif->clock[CLK_CAM]); + if (ret) { + clk_disable(camif->clock[CLK_GATE]); + return ret; + } + return 0; } -- 2.39.5