scsi: ufs: Unlock on a couple error paths (bb14dd15) · Commits · 戴 / test

drivers/scsi/ufs/ufshcd.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -2617,8 +2617,10 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,
		* the maximum wait time is bounded by SCSI request timeout.
		*/
		req = blk_get_request(q, REQ_OP_DRV_OUT, 0);
		if (IS_ERR(req))
		return PTR_ERR(req);
		if (IS_ERR(req)) {
		err = PTR_ERR(req);
		goto out_unlock;
		}
		tag = req->tag;
		WARN_ON_ONCE(!ufshcd_valid_tag(hba, tag));

		@@ -2646,6 +2648,7 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,

		out_put_tag:
		blk_put_request(req);
		out_unlock:
		up_read(&hba->clk_scaling_lock);
		return err;
		}
		@@ -5854,8 +5857,10 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
		down_read(&hba->clk_scaling_lock);

		req = blk_get_request(q, REQ_OP_DRV_OUT, 0);
		if (IS_ERR(req))
		return PTR_ERR(req);
		if (IS_ERR(req)) {
		err = PTR_ERR(req);
		goto out_unlock;
		}
		tag = req->tag;
		WARN_ON_ONCE(!ufshcd_valid_tag(hba, tag));

		@@ -5934,6 +5939,7 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
		}

		blk_put_request(req);
		out_unlock:
		up_read(&hba->clk_scaling_lock);
		return err;
		}