diff options
| author | jakllsch <jakllsch@NetBSD.org> | 2012-07-15 01:15:03 +0000 |
|---|---|---|
| committer | jakllsch <jakllsch@NetBSD.org> | 2012-07-15 01:15:03 +0000 |
| commit | ca26f9df280cf31c0c0a071abb4cda8268486ae9 (patch) | |
| tree | 0f88623a2a72824d04fa11ce917d158d4fac740a /sys/dev | |
| parent | eac94053a1cd120f0a1b7ee394a6e9a7c61fc10c (diff) | |
Fix obvious copy/paste-induced error (my fault) that would clobber
the bottom 24-bits of r_lba during a LBA48 command with AT_READREG.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/mvsata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/mvsata.c b/sys/dev/ic/mvsata.c index df1e75326f5..65ca5aa81f3 100644 --- a/sys/dev/ic/mvsata.c +++ b/sys/dev/ic/mvsata.c @@ -1,4 +1,4 @@ -/* $NetBSD: mvsata.c,v 1.18 2012/07/12 14:17:03 reinoud Exp $ */ +/* $NetBSD: mvsata.c,v 1.19 2012/07/15 01:15:03 jakllsch Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.18 2012/07/12 14:17:03 reinoud Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.19 2012/07/15 01:15:03 jakllsch Exp $"); #include "opt_mvsata.h" @@ -1739,7 +1739,7 @@ mvsata_wdc_cmd_done(struct ata_channel *chp, struct ata_xfer *xfer) } ata_c->r_count |= MVSATA_WDC_READ_1(mvport, SRB_SC) << 8; - ata_c->r_lba = + ata_c->r_lba |= (uint64_t)MVSATA_WDC_READ_1(mvport, SRB_LBAL) << 24; ata_c->r_lba |= (uint64_t)MVSATA_WDC_READ_1(mvport, SRB_LBAM) << 32; |
