Merge patch series "scsi: ufs: core: Always read the descriptors with max length"

[sfrench/cifs-2.6.git] / drivers / ufs / core / ufshpb.c

diff --git a/drivers/ufs/core/ufshpb.c b/drivers/ufs/core/ufshpb.c
index 994f4ac9df5a51bada1444877eee7c9983db2ca8..a46a7666c891b49a8ff7a50f20137367943e919a 100644 (file)
--- a/drivers/ufs/core/ufshpb.c
+++ b/drivers/ufs/core/ufshpb.c
@@ -2382,12 +2382,10 @@ static int ufshpb_get_lu_info(struct ufs_hba *hba, int lun,
 {
        u16 max_active_rgns;
        u8 lu_enable;
-       int size;
+       int size = QUERY_DESC_MAX_SIZE;
        int ret;
        char desc_buf[QUERY_DESC_MAX_SIZE];
 
-       ufshcd_map_desc_id_to_length(hba, QUERY_DESC_IDN_UNIT, &size);
-
        ufshcd_rpm_get_sync(hba);
        ret = ufshcd_query_descriptor_retry(hba, UPIU_QUERY_OPCODE_READ_DESC,
                                            QUERY_DESC_IDN_UNIT, lun, 0,