Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72607198 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: fix an error in getting UFS spec version"

parents 6ca7f254 24517815

drivers/scsi/ufs/ufshcd.c

+3 −3
Original line number Diff line number Diff line
@@ -8311,6 +8311,9 @@ static int ufs_get_device_desc(struct ufs_hba *hba, 
	dev_desc->wmanufacturerid = desc_buf[DEVICE_DESC_PARAM_MANF_ID] << 8 |

				     desc_buf[DEVICE_DESC_PARAM_MANF_ID + 1];



	dev_desc->wspecversion = desc_buf[DEVICE_DESC_PARAM_SPEC_VER] << 8 |

				  desc_buf[DEVICE_DESC_PARAM_SPEC_VER + 1];



	model_index = desc_buf[DEVICE_DESC_PARAM_PRDCT_NAME];



	/* Zero-pad entire buffer for string termination. */
@@ -8332,9 +8335,6 @@ static int ufs_get_device_desc(struct ufs_hba *hba, 
	/* Null terminate the model string */

	dev_desc->model[MAX_MODEL_LEN] = '\0';



	dev_desc->wspecversion = desc_buf[DEVICE_DESC_PARAM_SPEC_VER] << 8 |

				  desc_buf[DEVICE_DESC_PARAM_SPEC_VER + 1];



out:

	kfree(desc_buf);

	return err;