| From b92988d7456902fdecb100946554abb544abc1aa Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 22 Dec 2021 01:37:45 +0100 |
| Subject: media: camss: vfe-170: fix "VFE halt timeout" error |
| |
| From: Jonathan Marek <jonathan@marek.ca> |
| |
| [ Upstream commit 1ce8c48b06f249a9739e36c5d56883f6f49ce047 ] |
| |
| This function waits for halt_complete but doesn't do anything to cause |
| it to complete, and always hits the "VFE halt timeout" error. Just delete |
| this code for now. |
| |
| Fixes: 7319cdf189bb ("media: camss: Add support for VFE hardware version Titan 170") |
| Signed-off-by: Jonathan Marek <jonathan@marek.ca> |
| Reviewed-by: Robert Foss <robert.foss@linaro.org> |
| Tested-by: Julian Grahsl <jgrahsl@snap.com> |
| Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> |
| Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/qcom/camss/camss-vfe-170.c | 12 +----------- |
| 1 file changed, 1 insertion(+), 11 deletions(-) |
| |
| diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c |
| index 5c083d70d495..af71dc659bb9 100644 |
| --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c |
| +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c |
| @@ -402,17 +402,7 @@ static irqreturn_t vfe_isr(int irq, void *dev) |
| */ |
| static int vfe_halt(struct vfe_device *vfe) |
| { |
| - unsigned long time; |
| - |
| - reinit_completion(&vfe->halt_complete); |
| - |
| - time = wait_for_completion_timeout(&vfe->halt_complete, |
| - msecs_to_jiffies(VFE_HALT_TIMEOUT_MS)); |
| - if (!time) { |
| - dev_err(vfe->camss->dev, "VFE halt timeout\n"); |
| - return -EIO; |
| - } |
| - |
| + /* rely on vfe_disable_output() to stop the VFE */ |
| return 0; |
| } |
| |
| -- |
| 2.34.1 |
| |
