diff options
| author | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2023-09-25 17:47:06 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2023-10-07 10:55:44 +0200 |
| commit | 5c07f30bed52ed85673b634f77467e404645785d (patch) | |
| tree | b1a76b645d67c032c83d9584ea20720e18b620a4 /drivers/media/platform/qcom | |
| parent | media: qcom: camss: Move vfe_disable into a common routine where applicable (diff) | |
| download | linux-5c07f30bed52ed85673b634f77467e404645785d.tar.xz linux-5c07f30bed52ed85673b634f77467e404645785d.zip | |
media: qcom: camss: Propagate vfe_reset error up the callstack
A previous patch I had removed the returns from vfe_disable() since we
didn't trap any meaningful errors. Konrad pointed out vfe_reset() could
return an error, which is true.
Trap the vfe_reset() error code and throw it up the callstack.
Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'drivers/media/platform/qcom')
| -rw-r--r-- | drivers/media/platform/qcom/camss/camss-vfe.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index b3d5af7f0969..4839e2cedfe5 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -435,8 +435,11 @@ static int vfe_disable_output(struct vfe_line *line) int vfe_disable(struct vfe_line *line) { struct vfe_device *vfe = to_vfe(line); + int ret; - vfe_disable_output(line); + ret = vfe_disable_output(line); + if (ret) + goto error; vfe_put_output(line); @@ -446,7 +449,8 @@ int vfe_disable(struct vfe_line *line) mutex_unlock(&vfe->stream_lock); - return 0; +error: + return ret; } /** |