Module Name: src
Committed By: jakllsch
Date: Sun Jul 15 01:15:03 UTC 2012
Modified Files:
src/sys/dev/ic: mvsata.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/mvsata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.18 src/sys/dev/ic/mvsata.c:1.19
--- src/sys/dev/ic/mvsata.c:1.18 Thu Jul 12 14:17:03 2012
+++ src/sys/dev/ic/mvsata.c Sun Jul 15 01:15:03 2012
@@ -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 *
}
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;
