From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75E4CC56201 for ; Sun, 22 Nov 2020 04:09:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 26A602076E for ; Sun, 22 Nov 2020 04:09:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="H9o3IDcP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727095AbgKVEIy (ORCPT ); Sat, 21 Nov 2020 23:08:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726693AbgKVEIw (ORCPT ); Sat, 21 Nov 2020 23:08:52 -0500 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDFCDC0613D2 for ; Sat, 21 Nov 2020 20:08:51 -0800 (PST) Received: by mail-ot1-x344.google.com with SMTP id n11so12797478ota.2 for ; Sat, 21 Nov 2020 20:08:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=1+eyUtmtAjsxqioppn1au2QM1OrIpCppXp8wpa6NVJc=; b=H9o3IDcPqHxIRAJk/VPIody7M0PPT3eLBVvvSPaCQvdyWMPnIl2LDupEvrIFRXDpT0 kkyVDf9AjK5fLIj8uPbM6V8RHgGMuk+N0mDcFUw8zwDDLtKGTtOFG69XSCO9QmDx6L8x svlwlSTuZLuKn2AdfDZ8xA4M45AjfxyUNRaM0CpWeDSYhlbk5UfEukhVCGpcPeVpJN50 r9ZXOrs1DQWD2+4qaGmEG8xN3rEmKoBmBUhX2DetCfbUuVeO2QAyf90kixeKgfL6w57Q Ol/VE7kqOzrj1n/0jYfc+TtivFdj5xpP/rXR6ojRrulonHqV2oQvs+ESVoAS7nrecfsN 6+Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=1+eyUtmtAjsxqioppn1au2QM1OrIpCppXp8wpa6NVJc=; b=L4teWpSZnC8dndGFZdQoMEuVz0vdnaUPf1SSX5OwvaNbTyqh4hDfpZhOhvPegQ7HBN 8vdY1RMbFoKRp27DoVbcAVCUAhK7D1DdhQkOWqj8vZtB6GzlOBk9d6MRj+EgEOBrmQCN qMGh5ASuorA5ATIYsoI5Vmo8PaZBT8htGdoD4x1uRvWO0kHEjDfWU2Pge+QryPx3+M8H gEr7/deeUw2aMWieyylw4sVpZk2zAAssbOu+vqMCkBvRbSVf0L8nNjXzKp699ung7yDZ rVCqPv5WX9tfpLgFR+v9TsN5AUFxi2Z8tB3Ki18zbiO85FfOTePHDbT9S9Nmdl1UrVEV ykmA== X-Gm-Message-State: AOAM532YqdNDbjTzJwQVm/8+rlR0YirOfxK1wfV6Rcy02Vu7K5zzq17z LgF733Ppv/sT6FKaw6Um8JGiTw== X-Google-Smtp-Source: ABdhPJzDLfEkZxcFiWaLStMrxjN/UhXjzvllrqtvzx0fXPC+nCUgusgbAX6kKqGdHvA3LzoxEK2tgw== X-Received: by 2002:a9d:892:: with SMTP id 18mr11024273otf.9.1606018130559; Sat, 21 Nov 2020 20:08:50 -0800 (PST) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id p12sm4131377oti.35.2020.11.21.20.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Nov 2020 20:08:49 -0800 (PST) Date: Sat, 21 Nov 2020 22:08:48 -0600 From: Bjorn Andersson To: Zhihao Cheng Cc: agross@kernel.org, wsa@kernel.org, sricharan@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, yi.zhang@huawei.com Subject: Re: [PATCH] i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc() Message-ID: <20201122040848.GB95182@builder.lan> References: <20201116141058.2365043-1-chengzhihao1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201116141058.2365043-1-chengzhihao1@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Mon 16 Nov 08:10 CST 2020, Zhihao Cheng wrote: > Fix to return the error code from qup_i2c_change_state() > instaed of 0 in qup_i2c_bam_schedule_desc(). > > Fixes: fbf9921f8b35d9b2 ("i2c: qup: Fix error handling") > Reported-by: Hulk Robot > Signed-off-by: Zhihao Cheng > --- > drivers/i2c/busses/i2c-qup.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c > index fbc04b60cfd1..5a47915869ae 100644 > --- a/drivers/i2c/busses/i2c-qup.c > +++ b/drivers/i2c/busses/i2c-qup.c > @@ -801,7 +801,8 @@ static int qup_i2c_bam_schedule_desc(struct qup_i2c_dev *qup) > 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); In the case that we entered this block because ret was -ETIMEDOUT then this will overwrite this and the function will return -EIO. But in the other paths out of this block ret is being overwritten anyways, so I think it's fine. Reviewed-by: Bjorn Andersson Regards, Bjorn > + if (ret) { > dev_err(qup->dev, "change to run state timed out"); > goto desc_err; > } > -- > 2.25.4 >