1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 242c43eef807..b3900cfbd880 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1050,14 +1050,15 @@ static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc)
 static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
 {
         u64 lba = 0;
-        u32 len = 0;
+        u32 len;
 
         VPRINTK("six-byte command\n");
 
+        lba |= ((u64)(cdb[1] & 0x1f)) << 16;
         lba |= ((u64)cdb[2]) << 8;
         lba |= ((u64)cdb[3]);
 
-        len |= ((u32)cdb[4]);
+        len = cdb[4];
 
         *plba = lba;
         *plen = len;