Jeff Garzik wrote:
> And a few trivial documentation patches.
>
> Please pull from 'upstream-linus' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
>
> to receive the following updates:
>
> drivers/ata/libata-scsi.c | 5 ++-
> drivers/ata/pata_artop.c | 2 +-
> drivers/ata/pata_hpt37x.c | 27 ++++++++++---------------
> drivers/ata/pata_it821x.c | 3 +-
> drivers/ata/pata_scc.c | 46 ++++++++++++++++++++++++++-----------------
> drivers/ata/pata_via.c | 9 ++++---
> drivers/ata/sata_mv.c | 44 ++++++++++++++++++++++++++++++++++++++++++
> drivers/ata/sata_promise.c | 2 +-
> drivers/ata/sata_sis.c | 2 +-
> drivers/ata/sata_via.c | 3 ++
> 10 files changed, 98 insertions(+), 45 deletions(-)
>
> Alan Cox (2):
> pata: Trivia
> pata_hpt37x: Further improvements based on the IDE updates and vendor drivers
>
> Jeff Garzik (4):
> [libata] sata_promise: fix flags typo
> [libata] sata_mv: add TODO list
> [libata] Fix decoding of 6-byte commands
> [libata] sata_via, pata_via: Add PCI IDs.
>
> Tony Breeds (1):
> Fix build failure for drivers/ata/pata_scc.c
>
> Uwe Koziolek (1):
> libata: sata_sis fixes
>
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index 242c43e..b3900cf 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;
Oops, I overlooked the MSB bits. :(
Thanks for catching this.
--
albert
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
