Commit 5c07f30b authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Hans Verkuil

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: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 90cc4555
...@@ -435,8 +435,11 @@ static int vfe_disable_output(struct vfe_line *line) ...@@ -435,8 +435,11 @@ static int vfe_disable_output(struct vfe_line *line)
int vfe_disable(struct vfe_line *line) int vfe_disable(struct vfe_line *line)
{ {
struct vfe_device *vfe = to_vfe(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); vfe_put_output(line);
...@@ -446,7 +449,8 @@ int vfe_disable(struct vfe_line *line) ...@@ -446,7 +449,8 @@ int vfe_disable(struct vfe_line *line)
mutex_unlock(&vfe->stream_lock); mutex_unlock(&vfe->stream_lock);
return 0; error:
return ret;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment