summaryrefslogtreecommitdiff
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-09-27 09:58:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-09-27 09:58:02 -0700
commit633b47cb009d09dc8f4ba9cdb3a0ca138809c7c7 (patch)
tree12eac99049a12e2fb6942c445d9c63a4a06bc217 /drivers/scsi/scsi_scan.c
parentb6cd17050bc0817c79924f23716198b2e935556e (diff)
parent2132df16f53b4f01ab25f5d404f36a22244ae342 (diff)
downloadlinux-633b47cb009d09dc8f4ba9cdb3a0ca138809c7c7.tar.gz
linux-633b47cb009d09dc8f4ba9cdb3a0ca138809c7c7.tar.bz2
linux-633b47cb009d09dc8f4ba9cdb3a0ca138809c7c7.zip
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "A single fix for libata: older devices don't support command duration limits (CDL) and some don't support report opcodes, meaning there's no way to tell if they support the command or not. Reduce the problems of incorrectly using CDL commands on older devices by checking SCSI spec compliance at SPC-5 (the spec which introduced the command) before turning on CDL" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: core: ata: Do no try to probe for CDL on old drives
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 52014b2d39e1..eaa972bee6c0 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -822,7 +822,7 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
* device is attached at LUN 0 (SCSI_SCAN_TARGET_PRESENT) so
* non-zero LUNs can be scanned.
*/
- sdev->scsi_level = inq_result[2] & 0x07;
+ sdev->scsi_level = inq_result[2] & 0x0f;
if (sdev->scsi_level >= 2 ||
(sdev->scsi_level == 1 && (inq_result[3] & 0x0f) == 1))
sdev->scsi_level++;