Merge "scsi: ufs: Add missing kfree for descriptor buffer" (d490c2fc) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/scsi/ufs/ufshcd.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -8105,7 +8105,7 @@ static void ufshcd_set_active_icc_lvl(struct ufs_hba *hba)
		dev_err(hba->dev,
		"%s: Failed reading power descriptor.len = %d ret = %d",
		__func__, buff_len, ret);
		return;
		goto out;
		}

		icc_level = ufshcd_find_max_sup_active_icc_level(hba, desc_buf,
		@@ -8119,6 +8119,8 @@ static void ufshcd_set_active_icc_lvl(struct ufs_hba *hba)
		dev_err(hba->dev,
		"%s: Failed configuring bActiveICCLevel = %d ret = %d",
		__func__, icc_level, ret);
		out:
		kfree(desc_buf);
		}

		static int ufshcd_set_low_vcc_level(struct ufs_hba *hba,
		@@ -8643,7 +8645,7 @@ static int ufshcd_get_dev_ref_clk_gating_wait(struct ufs_hba *hba,

		static int ufs_read_device_desc_data(struct ufs_hba *hba)
		{
		int err;
		int err = 0;
		u8 *desc_buf = NULL;

		if (hba->desc_size.dev_desc) {
		@@ -8657,7 +8659,7 @@ static int ufs_read_device_desc_data(struct ufs_hba *hba)
		}
		err = ufshcd_read_device_desc(hba, desc_buf, hba->desc_size.dev_desc);
		if (err)
		return err;
		goto out;

		/*
		* getting vendor (manufacturerID) and Bank Index in big endian
		@@ -8673,7 +8675,9 @@ static int ufs_read_device_desc_data(struct ufs_hba *hba)
		desc_buf[DEVICE_DESC_PARAM_SPEC_VER] << 8 \|
		desc_buf[DEVICE_DESC_PARAM_SPEC_VER + 1];

		return 0;
		out:
		kfree(desc_buf);
		return err;
		}

		/**