diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-01-27 05:36:54 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-01-27 05:52:58 +0300 |
| commit | 4d82e9db422ec34793650a34c5f03edd7b0abbaf (patch) | |
| tree | 59a8eda6e6f11f6226c5910c6f41695b964ca03e /drivers/scsi/megaraid | |
| parent | 18c05faf8ab14913c8144108661efa8f17b10b5b (diff) | |
| parent | aa2c24e7f415e9c13635cee22ff4e15a80215551 (diff) | |
| download | linux-4d82e9db422ec34793650a34c5f03edd7b0abbaf.tar.xz | |
Merge branch '5.11/scsi-fixes' into 5.12/scsi-queue
The UFS core has received a substantial rework this cycle. This in
turn has caused a merge conflict in linux-next. Merge 5.11/scsi-fixes
into 5.12/scsi-queue and resolve the conflict.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/megaraid')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index af192096a82b..63a4f48bdc75 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -8244,11 +8244,9 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance, goto out; } + /* always store 64 bits regardless of addressing */ sense_ptr = (void *)cmd->frame + ioc->sense_off; - if (instance->consistent_mask_64bit) - put_unaligned_le64(sense_handle, sense_ptr); - else - put_unaligned_le32(sense_handle, sense_ptr); + put_unaligned_le64(sense_handle, sense_ptr); } /* |