From 6e41c820f6af0ba512ac4920dc588486049c842e Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 28 Oct 2021 15:56:10 -0700 Subject: [PATCH] ANDROID: scsi: ufs: Remove a local variable from ufshcd_abort() Bring the Android code in sync with the upstream code. This patch does not change any functionality. Bug: 204438323 Change-Id: I8fe9f9f3c7d39feb1e211a6b6dc00d6e638ef1b4 Signed-off-by: Bart Van Assche --- drivers/scsi/ufs/ufshcd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 0aefa399f425..a341b3b1b14d 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7042,7 +7042,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) int tag = scsi_cmd_to_rq(cmd)->tag; struct ufshcd_lrb *lrbp = &hba->lrb[tag]; unsigned long flags; - int err = FAILED, res; + int err = FAILED; u32 reg; WARN_ONCE(tag < 0, "Invalid tag %d\n", tag); @@ -7112,10 +7112,11 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto release; } - res = ufshcd_try_to_abort_task(hba, tag); - if (res) { - dev_err(hba->dev, "%s: failed with err %d\n", __func__, res); + err = ufshcd_try_to_abort_task(hba, tag); + if (err) { + dev_err(hba->dev, "%s: failed with err %d\n", __func__, err); ufshcd_set_req_abort_skip(hba, hba->outstanding_reqs); + err = FAILED; goto release; }