mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 07:31:29 +00:00
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>
This commit is contained in:
parent
90cc455573
commit
5c07f30bed
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user