From a7da3b29591656e60597cccc866808e3bcf6b51b Mon Sep 17 00:00:00 2001 From: Raviv Shvili Date: Thu, 20 Mar 2014 21:33:04 +0200 Subject: [PATCH] scsi: ufs: add descriptor read support Allow reading descriptors with length which is different than the descriptors max size. Change-Id: Ia0685ae147883f33466865d2348d71473e0d5173 Signed-off-by: Raviv Shvili --- drivers/scsi/ufs/ufshcd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index a2c32209ca80..a238db4f305e 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -2085,10 +2085,8 @@ static int ufshcd_read_desc_param(struct ufs_hba *hba, desc_id, desc_index, 0, desc_buf, &buff_len); - if (ret || (buff_len < ufs_query_desc_max_size[desc_id]) || - (desc_buf[QUERY_DESC_LENGTH_OFFSET] != - ufs_query_desc_max_size[desc_id]) - || (desc_buf[QUERY_DESC_DESC_TYPE_OFFSET] != desc_id)) { + if (ret || (buff_len != desc_buf[QUERY_DESC_LENGTH_OFFSET]) || + (desc_buf[QUERY_DESC_DESC_TYPE_OFFSET] != desc_id)) { dev_err(hba->dev, "%s: Failed reading descriptor. desc_id %d, param_offset %d, buff_len %d ,index %d, ret %d", __func__, desc_id, param_offset, buff_len, desc_index, ret);