evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "scsi: ufs: Initialize cmd_id and check lrbp->cmd NULL"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-15 03:51:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit e7c8de8d94
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/scsi/ufs/ufshcd.c
View file

@ -653,7 +653,7 @@ static inline void ufshcd_cond_add_cmd_trace(struct ufs_hba *hba,
struct ufshcd_lrb *lrbp;
char *cmd_type;
u8 opcode = 0;
u8 cmd_id, idn = 0;
u8 cmd_id = 0, idn = 0;
sector_t lba = -1;
int transfer_len = -1;
@ -674,7 +674,7 @@ static inline void ufshcd_cond_add_cmd_trace(struct ufs_hba *hba,
}
}
if (lrbp->command_type == UTP_CMD_TYPE_SCSI) {
if (lrbp->cmd && (lrbp->command_type == UTP_CMD_TYPE_SCSI)) {
cmd_type = "scsi";
cmd_id = (u8)(*lrbp->cmd->cmnd);
} else if (lrbp->command_type == UTP_CMD_TYPE_DEV_MANAGE) {