From: Bean Huo <bean...@micron.com> For the UFS device, the maximum descriptor size is 255, max_t called in ufs_get_device_desc() is useless.
Signed-off-by: Bart van Assche <bvanass...@acm.org> Signed-off-by: Bean Huo <bean...@micron.com> Acked-by: Avri Altman <avri.alt...@wdc.com> Reviewed-by: Stanley Chu <stanley....@mediatek.com> --- drivers/scsi/ufs/ufshcd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index ad4fc829cbb2..2cf077ab9dfd 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6903,14 +6903,11 @@ static void ufs_fixup_device_setup(struct ufs_hba *hba) static int ufs_get_device_desc(struct ufs_hba *hba) { int err; - size_t buff_len; u8 model_index; u8 *desc_buf; struct ufs_dev_info *dev_info = &hba->dev_info; - buff_len = max_t(size_t, hba->desc_size.dev_desc, - QUERY_DESC_MAX_SIZE + 1); - desc_buf = kmalloc(buff_len, GFP_KERNEL); + desc_buf = kmalloc(QUERY_DESC_MAX_SIZE, GFP_KERNEL); if (!desc_buf) { err = -ENOMEM; goto out; -- 2.17.1