diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2019-10-10 03:54:04 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-10-10 03:54:04 +0200 |
| commit | a3a8d13f625d9f20664515d61d4c9a9452119d21 (patch) | |
| tree | 8d3bd45b741f10980c141cc35c06143a82e8ea18 /drivers/scsi/sd.c | |
| parent | scsi: target: Remove tpg_list and se_portal_group.se_tpg_node (diff) | |
| parent | scsi: MAINTAINERS: Update qla2xxx driver (diff) | |
| download | linux-a3a8d13f625d9f20664515d61d4c9a9452119d21.tar.xz linux-a3a8d13f625d9f20664515d61d4c9a9452119d21.zip | |
Merge branch '5.4/scsi-fixes' into 5.5/scsi-queue
The qla2xxx driver updates for 5.5 depend on the fixes queued for
5.4.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a16014f04aa4..326e2877f169 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1654,7 +1654,8 @@ static int sd_sync_cache(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr) /* we need to evaluate the error return */ if (scsi_sense_valid(sshdr) && (sshdr->asc == 0x3a || /* medium not present */ - sshdr->asc == 0x20)) /* invalid command */ + sshdr->asc == 0x20 || /* invalid command */ + (sshdr->asc == 0x74 && sshdr->ascq == 0x71))) /* drive is password locked */ /* this is no error here */ return 0; |