shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: scsi: ufs: Remove a local variable from ufshcd_abort()

Browse Source 
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 <bvanassche@google.com>
This commit is contained in:
Bart Van Assche
2021-10-28 15:56:10 -07:00
parent 69d296ea60
commit 6e41c820f6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/ufs/ufshcd.c
View File

@@ -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;
}