Commit c05b6769 authored Nov 16, 2020 by Zhihao Cheng Committed by Greg Kroah-Hartman Dec 11, 2020

i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc()



commit e9acf0298c664f825e6f1158f2a97341bf9e03ca upstream.

Fix to return the error code from qup_i2c_change_state()
instaed of 0 in qup_i2c_bam_schedule_desc().

Fixes: fbf9921f ("i2c: qup: Fix error handling")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a6b17524

drivers/i2c/busses/i2c-qup.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -810,7 +810,8 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev qup, struct i2c_msg msg,
		if (ret \|\| qup->bus_err \|\| qup->qup_err) {
		reinit_completion(&qup->xfer);

		if (qup_i2c_change_state(qup, QUP_RUN_STATE)) {
		ret = qup_i2c_change_state(qup, QUP_RUN_STATE);
		if (ret) {
		dev_err(qup->dev, "change to run state timed out");
		goto desc_err;
		}